socotra-build 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29953de664d9653420f9fd9ac27ba490455dd621
-  data.tar.gz: 99daabd2d082d93c0df43d2fa87b9b968f9864d5
+  metadata.gz: 3ac97b1ead221f62517364d46f7e1bdb556af73b
+  data.tar.gz: 626064014c3831a94efb8ed49f33892cc7cd5181
 SHA512:
-  metadata.gz: cddc28aeaacb5bbed64e9a1a01f84b4e63ce1b8db05ea8122b9a0ea99a4e73f2527e3910433699a5777d35cef7148f8f2da2584d85321961a3cf83b34434683a
-  data.tar.gz: e61d9d383d0e017d7facd973bddd172757c8ac7964770822aed18c3c72d5741e349a81fb6516bc89018d5f2d6e08839db5a49807e614d52872b5daa6491ddd7d
+  metadata.gz: 353d745d34ae15d62603bb6767514408ac0ad73988a7c7330e33a3a97f7b0a615d64811025a2d65fb595695d50aed4b284cc466334691dcfe21c53c7a02dbdfa
+  data.tar.gz: 9bf9e6feb39f46c6b26a5b5e2c4a3c4c41a708dc3d1a64dbc0693035a1d80e63ff8e0a5d9be80d37a3d18409d287175bff447065994f950ac33b3561ef2da33e

data/lib/socotra-build.rb

@@ -122,28 +122,10 @@ def self.revoke_lease(lease_id, log_identifier)
 	safe_retry(cmd, log_identifier, "Revoking lease failed", false, "ERROR", false)
 end
 
-def self.install_socotra_py_modules(environment)
-    cmd = "sudo pip list |grep socotra; if [ $? -eq 0 ];then /usr/bin/yes|sudo pip uninstall socotra;fi"
-    system_safe(cmd, "uninstall_socotra_py_module", "Failed to uninstall socotra")
+def self.install_socotra_py_modules(pymodule, environment)
+    cmd = "sudo pip list |grep #{pymodule}; if [ $? -eq 0 ];then /usr/bin/yes|sudo pip uninstall #{pymodule};fi"
+    system_safe(cmd, "uninstall_#{pymodule}_py_module", "Failed to uninstall #{pymodule}")
 
-    cmd = "/usr/bin/yes|sudo pip install --trusted-host socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com --extra-index-url=http://socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com/socotra/#{environment} socotra"
-    system_safe(cmd, "install_socotra_py_module", "Failed to install socotra")
-
-    cmd = "sudo pip list |grep provisioner; if [ $? -eq 0 ];then /usr/bin/yes|sudo pip uninstall provisioner;fi"
-    system_safe(cmd, "uninstall_provisioner_py_module", "Failed to uninstall provisioner")
-
-    cmd = "/usr/bin/yes|sudo pip install --trusted-host socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com --extra-index-url=http://socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com/provisioner/#{environment} provisioner"
-    system_safe(cmd, "install_provisioner_py_module", "Failed to install provisioner")
-
-    cmd = "sudo pip list |grep e2e; if [ $? -eq 0 ];then /usr/bin/yes|sudo pip uninstall e2e;fi"
-    system_safe(cmd, "uninstall_e2e_py_module", "Failed to uninstall e2e")
-
-    cmd = "/usr/bin/yes|sudo pip install --trusted-host socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com --extra-index-url=http://socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com/e2e/#{environment} e2e"
-    system_safe(cmd, "install_e2e_py_module", "Failed to install e2e")
-
-    cmd = "sudo pip list |grep smonitor; if [ $? -eq 0 ];then /usr/bin/yes|sudo pip uninstall smonitor;fi"
-    system_safe(cmd, "uninstall_smonitor_py_module", "Failed to uninstall smonitor")
-
-    cmd = "/usr/bin/yes|sudo pip install --trusted-host socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com --extra-index-url=http://socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com/smonitor/#{environment} smonitor"
-    system_safe(cmd, "install_smonitor_py_module", "Failed to install smonitor")
+    cmd = "/usr/bin/yes|sudo pip install --trusted-host socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com --extra-index-url=http://socotra-pypi-euw1.s3-website-eu-west-1.amazonaws.com/#{pymodule}/#{environment} #{pymodule}"
+    system_safe(cmd, "install_#{pymodule}_py_module", "Failed to install #{pymodule}")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Chris Antenesse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies: []
 description: Common functions for build
 email: chris.antenesse@socotra.com