socotra-build 0.3.23 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff371fbd0cce6094dd41d75aa93b08441817c241
-  data.tar.gz: aea9ada6a6b9abd515c590b3bb8789e58fe1a2d6
+  metadata.gz: 6960b35e032078950542ff01f1c5de7dd7d42a8e
+  data.tar.gz: 7e2e9661906dc669bd4902bc6c8799be5d3b8c97
 SHA512:
-  metadata.gz: cf449a0e65e799b2ffc07bd932ba8b4e61a9e38f047729c27d90476195c23812bcc8ac9924a96910b66a8b352545fab296b2b792ae4c011504be9b4fbe18f275
-  data.tar.gz: 678c50e680c4070cc7acc7bff3539466824774fe25375d86e455f5e8518ce40d00372c58fa55360cd3778a73566fc6930b6ed2dfe2bada1ac2bc7a341811e861
+  metadata.gz: 8b030a780150b700c042dfb4c23f164c1122c8b9cac7a1632183ef2e892e5a4c1d3555d186669e66a2303f10bab1f21f3f17019a2fa2b4b0e40ef6a01a275293
+  data.tar.gz: 18a2c7e4befe1ab594477fbcbedd01468e5244ee677ee0891482a1a19b5eb720efbdb3c13bba54619db325664cd5014750f665f642dd80c80d00e1c68c546b20

data/lib/socotra-build.rb

@@ -1,6 +1,5 @@
 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
@@ -135,10 +134,3 @@ def self.install_socotra_py_modules(pymodule, environment)
     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
-
-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

@@ -0,0 +1,97 @@
+require "json"
+require "httpclient"
+require "open-uri"
+require "zlib"
+require "rubygems/package"
+require "tempfile"
+require "yaml"
+
+def self.get_url(url)
+	timeout = 1200
+	c = HTTPClient.new
+	c.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+	c.ssl_config.timeout = timeout
+	connection_exceptions = [HTTPClient::BadResponseError, HTTPClient::ConnectTimeoutError]
+
+	begin
+		ssl_tries ||= timeout
+		dns_tries ||= timeout
+		http_tries ||= timeout
+		content = c.get_content(url)
+	rescue OpenSSL::SSL::SSLError
+		if (ssl_tries -= 1) > 0
+			sleep 1
+			retry
+		else
+			puts "ERROR: ELB is up, but instances are not (SSL)"
+			$build_failure = true
+		end
+	rescue *connection_exceptions
+		if (http_tries -= 1) > 0
+			sleep 1
+			retry
+		else
+			puts "ERROR: ELB is up, but instances are not (HTTP)"
+			$build_failure = true
+		end
+	rescue SocketError
+		if (dns_tries -= 1) > 0
+			sleep 1
+			retry
+		else
+			puts "ERROR: DNS record not created"
+			$build_failure = true
+		end
+	else
+		return content
+	end
+end
+
+def self.load_production_assets(version, github_username, github_password, tenant_name, domain, socotra_username, socotra_password, api_url, apidoc_url)
+	url = "https://github.com/socotra/prime/archive/#{version}.tar.gz"
+	assets_dir = Dir.mktmpdir
+	assets_artifact = "#{assets_dir}/#{version}.tar.gz"
+
+	open(assets_artifact, "w").write(open(url, :http_basic_authentication => [github_username, github_password]).read)
+
+	tar_extract = Gem::Package::TarReader.new(Zlib::GzipReader.open(assets_artifact))
+	tar_extract.rewind
+	tar_extract.each do |entry|
+		if entry.file?
+			FileUtils.mkdir_p(File.dirname("#{assets_dir}/#{entry.full_name}"))
+			File.open("#{assets_dir}/#{entry.full_name}", "wb") do |f|
+				f.write(entry.read)
+			end
+			File.chmod(entry.header.mode, "#{assets_dir}/#{entry.full_name}")
+		end
+	end
+	tar_extract.close
+
+	cmd = "socotraadmin tenant add_tenant #{tenant_name} --tenant_hostname=#{tenant_name}.co.#{domain} --tenant_path=#{assets_dir}/prime-#{version} --overwrite_ontology --admin_username=#{socotra_username} --admin_password=#{socotra_password} --apidoc_url=#{apidoc_url} --api_url=#{api_url}"
+	system_safe(cmd, "load_prod_assets_for_pr", "Failed to load prod asset for PR")
+end
+
+def self.load_tabular_datasources(jwtsecret, api_url, apidoc_url, admin_username, admin_password, tenant_name)
+	cmd = "socotraadmin tabular_datasource create_bulk \
+              --jwtsecret=#{$jwtsecret} \
+              --api_url=#{$api_url} \
+              --apidoc_url=#{$apidoc_url} \
+              --admin_username=#{$admin_username} \
+              --admin_password=#{$admin_password} \
+		      #{$tenant_name} \
+              $(pwd)/data/tables.json"
+    system_safe(cmd, "load_tabular_datasources", "Failed to load tabular datasources")
+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}"
+		
+	system_safe(cmd, "load_branch_assets_for_pr", "Failed to load prod asset for PR")
+end
+
+def self.load_tasks(version, environment, tenant_name)
+	cmd = "sg docker -c \'tasker --path=reports --tag=#{$version} --environment=#{$environment} --timezone='Africa/Kigali' --tenant=#{$tenant_name} -v\'"
+    system_safe(cmd, "load_tasks", "Failed to load task for PR")
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.3.24
 platform: ruby
 authors:
 - Chris Antenesse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-05 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies: []
 description: Common functions for build
 email: chris.antenesse@socotra.com
@@ -19,6 +19,7 @@ files:
 - lib/s3_uploader.rb
 - lib/socotra-build-update.rb
 - lib/socotra-build.rb
+- lib/tenant.rb
 homepage: http://rubygems.org/gems/socotra
 licenses:
 - MIT