prima-twig 0.53.10 → 0.53.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c1926245252be403da69fcb1bcea1a260652a892058935e336ea681e674d740
-  data.tar.gz: 89427c92d0fa37eb0e084b3ded263814e91e73bd48315776903322b6d2febf6d
+  metadata.gz: 698ada9cb02f767bdc8676488c7de698ca26539b46d866be88087f33724219a6
+  data.tar.gz: 1088d2c9559d908befe686d944671916110f6cea5d9251ce5e625c4722e37f7e
 SHA512:
-  metadata.gz: 8d3e06aef4280022b7d8033b06de957fb28954add42f48756e7f763ca85cac0a57e1496a0fb45a46bf1788eb0549a4f3b4b91866ac47aa48e57c3deec02cacaa
-  data.tar.gz: e9e3603dbaad5c8e7043da4065b901a110ca5036e25c33ab6eb86623f48fba86304949c634c4c387c36f18ae459ff1bc641af52d36ac41de711b849ac0189b4b
+  metadata.gz: bac02bc639fef9e6a2451b0ba46ec4c9f3e2f5c119b7a28eb3697345083a88aac6fc4a0e6acffc55fd2b5021466d335a208421733fc28296c9f47ccccca9a71a
+  data.tar.gz: 78be5c3cbb43cb13482121447865846e85e7a3fc80f830f3b7970b6ab222921fe3051e511c4c00661b2e2d72471c0f0a3b5c463270faf9e6d80efea4fcfe7449

data/bin/twig-feature

@@ -31,7 +31,7 @@ class Release
     @s3 = Aws::S3::Client.new
     @s3_bucket = 'prima-artifacts'
     @artifact_path = '/tmp/prima-artifact.zip'
-    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore2-TaskDefinitionDbRestore-1ELQ2B0YCR1U:1'
+    @import_db_task = 'arn:aws:ecs:eu-west-1:001575623345:task-definition/ecs-task-db-restore2-TaskDefinitionDbRestore-1BXH13XEVLPP0:1'
     @cf_role = 'arn:aws:iam::001575623345:role/qainit-service-role-cloudformat-CloudformationRole-18KBZQIS148R9'
     @dns_record_identifier = nil
     @ecs_cluster_name = nil
@@ -497,7 +497,7 @@ class Release
       end
     end
 
-    File.open('branch_names', 'w') { |file| file.write(branches) }
+    File.open('branch_names', 'w') { |file| file.write(JSON.generate(@projects)) }
 
     `git add projects && \
      git add branch_names && \
@@ -559,14 +559,18 @@ class Release
     # aggiornare il commit (revision a cui fa riferimento)
 
     # leggo il file branch_names / recupero i nomi dei branch / riscrivo tutto
+    projects = ''
     File.open('branch_names', 'r') do |file|
       file.each_line do |line|
-        project = line.split(':')
-        @projects[project[0]] = select_branch_to_deploy(project[0], project[1])
-        @projects[project[0]][:default_branch] = project[3]
+        projects = JSON.parse(line)
       end
     end
 
+    projects.each do |key, project|
+      @projects[key] = select_branch_to_deploy(key, project['name'])
+      @projects[key][:default_branch] = project['default_branch']
+    end
+
     branches = ''
 
     @projects.each_key do |project_key|
@@ -664,8 +668,8 @@ class Release
   end
 
   def qainit_write_output(file_message, output_message)
-    qa_file_name = "/etc/qainit-output/output"
-    File.open(qa_file_name, 'w') { |file| file.write(file_message) }
+    `mkdir -p /etc/qainit-output`
+    qa_file_name = "/etc/qainit-output/url_qa"
     File.open(qa_file_name + '.txt', 'w') { |file| file.write(file_message) }
     output "#{output_message} #{qa_file_name}".green
   end
@@ -852,6 +856,10 @@ class Release
       {
         parameter_key: "WebHostname",
         parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "HostnamePattern",
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -1766,6 +1774,10 @@ class Release
       {
         parameter_key: "WebHostname",
         parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "HostnamePattern",
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -1806,6 +1818,10 @@ class Release
       {
         parameter_key: "WebHostname",
         parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "HostnamePattern",
+        parameter_value: "consumer-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_consumer)
@@ -2091,7 +2107,7 @@ class Release
     when stack_name.include?('web')
       logical_resource_id = 'ECSServiceWebQA'
     when stack_name.include?('consumer')
-      logical_resource_id = 'ECSServiceConsumer'
+      logical_resource_id = 'ECSServiceConsumerQa'
     when stack_name.include?('urania')
       logical_resource_id = 'ECSServiceUraniaQA'
     when stack_name.include?('backoffice')
@@ -2289,23 +2305,28 @@ class Release
 
     `mv docker-compose-ci.yml docker-compose.yml`
     exec_step 'prepare-docker-compose --directory crash && cp docker-compose-qainit.yml docker-compose.yml'
-    [
-      'docker-compose build web',
-      "docker-compose run -w $PWD -u root -e MIX_ENV=qa -e ENV_HASH=#{deploy_id} web \
-      '-c' 'mix local.hex --force && mix hex.info && \
-      mix deps.get && \
-      cd assets && \
-      yarn --cache-folder ~/.cache/yarn && \
-      NODE_ENV=production sysconfcpus -n 1 yarn run build && \
-      cd ../ && \
-      mix release.clean --implode --no-confirm && \
-      mix phx.digest && \
-      mix deps.clean --all && \
-      mix deps.get && \
-      mix compile && mix release --env=qa'",
-      'docker-compose down'
-    ].each do |cmd|
-      execute_command cmd
+
+    if File.exists? 'deploy/build_qa_artifact'
+      `deploy/build_qa_artifact #{deploy_id}`
+    else # TODO remove when deploy/build_qa_artifact is merged
+      [
+        'docker-compose build web',
+        "docker-compose run -w $PWD -u root -e MIX_ENV=qa -e ENV_HASH=#{deploy_id} web \
+        '-c' 'mix local.hex --force && mix hex.info && \
+        mix deps.get && \
+        cd assets && \
+        yarn --cache-folder ~/.cache/yarn && \
+        NODE_ENV=production sysconfcpus -n 1 yarn run build && \
+        cd ../ && \
+        mix release.clean --implode --no-confirm && \
+        mix phx.digest && \
+        mix deps.clean --all && \
+        mix deps.get && \
+        mix compile && mix release --env=qa'",
+        'docker-compose down'
+      ].each do |cmd|
+        execute_command cmd
+      end
     end
 
     cleanup_containers
@@ -2344,6 +2365,7 @@ class Release
       MIX_ENV=dev mix compile.sms && \
       MIX_ENV=dev mix compile.html && \
       MIX_ENV=dev mix compile.heml && \
+      MIX_ENV=dev mix compile.app_notification && \
       rm -rf _build/qa/rel/ && \
       mix release --env=qa'"
     ].each do |cmd|
@@ -2431,6 +2453,7 @@ class Release
 
     decrypt_secrets() unless File.exist?('config/secrets.yml')
 
+    exec_step 'git submodule update'
     exec_step 'cp docker-compose-ci.yml docker-compose.yml'
     exec_step 'prepare-docker-compose --directory hutch && cp docker-compose-qainit.yml docker-compose.yml'
     exec_step "sed s/qa_deploy_id/#{get_deploy_id}/ .env.dist.qa"
@@ -2630,7 +2653,7 @@ class Release
       mix deps.get && mix compile && mix deps.compile && \
       mix phx.digest && \
       rm -rf _build/qa/rel/ && \
-      mix release --env=qa'"
+      mix distillery.release --env=qa'"
     ].each do |cmd|
       execute_command cmd
     end
@@ -2704,13 +2727,16 @@ class Release
 
     decrypt_secrets() unless File.exist?('config/secrets.yml')
 
-    exec_step 'cp docker-compose.yml docker-compose-ci.yml'
+    `mv docker-compose-ci.yml docker-compose.yml`
     exec_step 'prepare-docker-compose --directory starsky && cp docker-compose-qainit.yml docker-compose.yml'
     exec_step "sed s/qa_deploy_id/#{get_deploy_id}/ .env.dist.qa"
     exec_step "cp .env.dist.qa .env"
 
     [
       "sed -i 's/USER app/USER root/g' Dockerfile",
+      "if echo `docker network ls` | grep peano_default; \
+         then echo 'peano_default network already existing'; \
+          else docker network create peano_default; fi",
       "docker-compose build web",
       "docker-compose run -w $PWD -e BUILD_ENV=qa -u root --entrypoint /bin/sh web \
       '-c' 'cargo build --release -vv --features=qa \
@@ -2921,7 +2947,7 @@ class Release
   end
 
   def choose_branch_to_deploy(project_name, select_master = false)
-    return {} if project_name == 'crash' && select_master
+    return {name: 'master', revision: '399653d555b8864', committer: 'crash@prima.it', default_branch: true} if project_name == 'crash' && select_master
     Dir.chdir "projects/#{project_name}"
     output "Recupero la lista dei branch del progetto #{project_name}..."
     `git remote prune origin`

data/bin/twig-update-ami

@@ -150,7 +150,7 @@ class TwigUpdateAmi
   end
 
   def update_packer(json_filename)
-    execute_command "packer build  -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -var github_token=`biscuit get -f ../configs/secrets/common.yml common_private_repo_github_token` -machine-readable ./#{json_filename} | tee build.log"
+    execute_command "packer build  -var datadog_apikey=`biscuit get -f ../configs/secrets/common.yml common_production_apikey_datadog` -var github_token=`biscuit get -f ../configs/secrets/common.yml common_private_repo_github_token` -var drone_key=\"`biscuit get -f ../configs/secrets/common.yml drone_license_key`\" -machine-readable ./#{json_filename} | tee build.log"
     `grep 'artifact,0,id' build.log | cut -d, -f6 | cut -d: -f2`.sub(/\n/, '')
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.53.10
+  version: 0.53.34
 platform: ruby
 authors:
 - Matteo Giachino
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk