Travis fixes, Docker fixes, Windows template repacking fixes.

Ethicalhackx · May 2, 2018 · 78b642d · 78b642d
1 parent 3fbb6fb
commit 78b642d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -60,7 +60,7 @@ matrix:
       script:
         - source "${HOME}/INSTALL/bin/activate"
         # TODO(ogaro): Uncomment when we have a final solution for testing on MacOS.
-        #- pytest grr/client/grr_response_client/ --ignore grr/gui/selenium_tests/ --ignore grr/client/grr_response_client/linux/ --ignore grr/client/grr_response_client/client_actions/linux/
+        #- pytest grr/client/grr_response_client/ --ignore grr/server/grr_response_server/gui/selenium_tests/ --ignore grr/client/grr_response_client/linux/ --ignore grr/client/grr_response_client/client_actions/linux/
         - travis/build_templates.sh
         - travis/deploy_to_gcs.sh
 

diff --git a/grr/client/grr_response_client/client_build.py b/grr/client/grr_response_client/client_build.py
@@ -351,12 +351,16 @@ def RepackTemplates(self,
           elif f.endswith(".rpm"):
             to_sign.setdefault("rpm", []).append(os.path.join(root, f))
       if to_sign.get("windows"):
-        signer = repacking.TemplateRepacker().GetSigner(
-            ["ClientBuilder Context", "Target:Windows"])
+        signer = repacking.TemplateRepacker().GetSigner([
+            "ClientBuilder Context",
+            "Platform:%s" % platform.system(), "Target:Windows"
+        ])
         signer.SignFiles(to_sign.get("windows"))
       if to_sign.get("rpm"):
-        signer = repacking.TemplateRepacker().GetSigner(
-            ["ClientBuilder Context", "Target:Linux", "Target:LinuxRpm"])
+        signer = repacking.TemplateRepacker().GetSigner([
+            "ClientBuilder Context",
+            "Platform:%s" % platform.system(), "Target:Linux", "Target:LinuxRpm"
+        ])
         signer.AddSignatureToRPMs(to_sign.get("rpm"))
 
 

diff --git a/travis/build_local_pyindex.sh b/travis/build_local_pyindex.sh
@@ -30,8 +30,8 @@ function download_packages() {
     rm -rf local_pypi
   fi
 
-  pip download --dest=local_pypi sdists/grr-response-proto-*.zip
-  pip download --dest=local_pypi sdists/grr-response-core-*.zip
+  pip download --find-links=sdists --dest=local_pypi sdists/grr-response-proto-*.zip
+  pip download --find-links=sdists --dest=local_pypi sdists/grr-response-core-*.zip
   pip download --find-links=sdists --dest=local_pypi sdists/grr-response-client-*.zip
   pip download --find-links=sdists --dest=local_pypi sdists/grr-api-client-*.zip
   pip download --find-links=sdists --dest=local_pypi sdists/grr-response-server-*.zip