socotra-build 0.3.24 → 0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6960b35e032078950542ff01f1c5de7dd7d42a8e
-  data.tar.gz: 7e2e9661906dc669bd4902bc6c8799be5d3b8c97
+  metadata.gz: 4def628cb039a01eb741fb791175b74fd963037a
+  data.tar.gz: 1bf5c0dd46af9efa764dc1a32aae3efe6ef9f698
 SHA512:
-  metadata.gz: 8b030a780150b700c042dfb4c23f164c1122c8b9cac7a1632183ef2e892e5a4c1d3555d186669e66a2303f10bab1f21f3f17019a2fa2b4b0e40ef6a01a275293
-  data.tar.gz: 18a2c7e4befe1ab594477fbcbedd01468e5244ee677ee0891482a1a19b5eb720efbdb3c13bba54619db325664cd5014750f665f642dd80c80d00e1c68c546b20
+  metadata.gz: 35f46fbb9bd68aed0e6aa1323c7a4ff0fbb3fca5535db6ec1c8b88ae98bc6d1a8c16e9359316379420ed154db0fc9156ccbc13760ccf0f82f98344a51771ed78
+  data.tar.gz: f4b37067851eb1a0887bf07429a77e7ba0f7f605670330f9f6bdd73f2d30e36ed2d55ede0f04e46005aaf42577325d7dd6678a92637cc3e17aad8fe0431b60f1

data/lib/socotra-build.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'set'
+require_relative 's3_uploader'
 
 def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log_level="ERROR", log=true, tries=3)
     begin
@@ -131,6 +132,13 @@ 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/#{pymodule}/#{environment} #{pymodule}"
+    cmd = "/usr/bin/yes|sudo pip install --egg --process-dependency-links --allow-external mysql-connector-python --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
+
+def self.sync_logs(repo, build_id)
+    cmd = "cp -f console.log logs/"
+    system_safe(cmd, "copy_console_log", "Failed to copy console log")
+
+    upload_to_s3("logs", "socotra-builds/#{repo}/#{build_id}")
+end

data/lib/tenant.rb

@@ -84,7 +84,11 @@ def self.load_tabular_datasources(jwtsecret, api_url, apidoc_url, admin_username
 end
 
 def self.load_assets_from_branch(tenant_name, domain, admin_username, admin_password, api_url, apidoc_url)
-	cmd = "socotraadmin tenant add_tenant #{tenant_name} --overwrite_ontology --tenant_hostname=#{tenant_name}.co.#{domain} --tenant_path=. --admin_username=#{admin_username} --admin_password=#{admin_password} --apidoc_url=#{apidoc_url} --api_url=#{api_url}"
+	if api_url == "https://api.staging.socotra.com"
+		cmd = "socotraadmin tenant add_tenant #{tenant_name} --overwrite_ontology --tenant_hostname=#{tenant_name}.co.#{domain} --tenant_path=. --admin_username=#{admin_username} --admin_password=#{admin_password} --apidoc_url=#{apidoc_url} --api_url=#{api_url}"
+	else
+		cmd = "socotraadmin tenant add_tenant #{tenant_name} --tenant_hostname=#{tenant_name}.co.#{domain} --tenant_path=. --admin_username=#{admin_username} --admin_password=#{admin_password} --apidoc_url=#{apidoc_url} --api_url=#{api_url}"
+	end
 		
 	system_safe(cmd, "load_branch_assets_for_pr", "Failed to load prod asset for PR")
 end

metadata

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