prima-twig 0.44.15 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4029844705256e58a2e2238b5ec5e7799ede97741b3c2dcb640567218ea7de91
-  data.tar.gz: 8b76181eefd664d638c6d15ff5037f708bdb6d9eec50b985dad390b608690543
+  metadata.gz: b87cd2844f4baf2eded06e0fecfb0c7c78c2485555dd1e5e4dd982345ee0abc0
+  data.tar.gz: e22ac8615213cbf9a236c0e688e13fbdab05aec8af09117497af25178f47567a
 SHA512:
-  metadata.gz: 4150a4aa7225ead1e0de0ffbd9cc957979bbad9a313f680f6ec8c0ce83364db000be8cea5a663b9686a29868b8f215f5ede3c7df7d5975e1e6011e731b31293e
-  data.tar.gz: ac0618c8ea5a184baaf277553a8b841a46267595c67b6a84b572dd0f0e9569b0bb0619a09c3e2e4601ad2c1a377ba9d240830faed4719ea9a27cd2909aa0e169
+  metadata.gz: e8b6a42ab92414c9cef84116d7959aa532b22c302a21eb5f2d8944a969dcdc5bf0c4e7da971d7d8affe25c10d3d2c295dae15d54734ec941e8f1c39eb0790cba
+  data.tar.gz: 6e87475618bbcb40f09f40ca194ce6b08af481d9a50d856de9ce03e6c93e7c362754cf777a4c0cd888b03173e208fef0b4cab55fc466ddfa260a6ad54fbeaf13

data/bin/twig-deploy

@@ -188,12 +188,13 @@ class Review
     artifacts = []
     resp = @s3.list_objects(bucket: @s3_bucket, prefix: 'prima')
     resp.contents.each do |l|
+      # aggiungiamo solo gli artefatti prodotti a partire dal branch master, riconosciuti tramite i metadata
       rev = l.key.match(/^prima\/(\w{15}).tar.gz$/).captures.first if l.key.match(/^prima\/(\w{15}).tar.gz$/)
       if rev
         object = @s3.head_object(bucket: @s3_bucket, key: l.key)
         commit_msg = ''
         commit_msg = Base64.decode64(object.metadata['commit_msg']).strip if object.metadata.has_key? 'commit_msg'
-        artifacts << {rev: rev, created_at: object.last_modified, branch: object.metadata['branch'], commit_msg: commit_msg } if object.metadata.has_key? 'branch'
+        artifacts << {rev: rev, created_at: object.last_modified, branch: object.metadata['branch'], commit_msg: commit_msg } if (object.metadata.has_key? 'branch') && (object.metadata['branch'] == 'master')
       end
     end
     artifacts.sort_by { |v| v[:created_at] }.reverse

data/bin/twig-feature

@@ -764,7 +764,7 @@ class Release
         },
         {
           parameter_key: "ReleaseVersion",
-          parameter_value: "#{@projects["prima"][:revision]}-#{deploy_id}"
+          parameter_value: "#{@projects["prima"][:revision]}"
         },
         {
           parameter_key: "TaskDesiredCount",
@@ -797,6 +797,22 @@ class Release
         {
           parameter_key: "EnvHash",
           parameter_value: deploy_id
+        },
+        {
+          parameter_key: "AssangeHostname",
+          parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+        },
+        {
+          parameter_key: "BackofficeHostname",
+          parameter_value: "backoffice-#{@dns_record_identifier}.qa.colaster.com"
+        },
+        {
+          parameter_key: "WebHostname",
+          parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+        },
+        {
+          parameter_key: "WebRiHostname",
+          parameter_value: "wwwri-#{@dns_record_identifier}.qa.colaster.com"
         }
       ]
       if stack_exists?(stack_name_web)
@@ -983,7 +999,7 @@ class Release
     ]
     create_stack(stack_name_db, stack_body, parameters, tags, @cf_role) unless stack_exists?(stack_name_db) # creazione asincrona stack dei db (~4 min)
 
-    create_prima_artifact(@projects["prima"][:revision], @projects["prima"][:name], deploy_id) unless artifact_exists?('prima-artifacts-encrypted', "prima/#{@projects["prima"][:revision]}-#{deploy_id}.tar.gz")
+    create_prima_artifact(@projects["prima"][:revision], @projects["prima"][:name]) unless artifact_exists?('prima-artifacts-encrypted', "prima/#{@projects["prima"][:revision]}.tar.gz")
     # l'artefatto di prima viene creato sempre (puntamenti all'ambiente compilati nel js) e richiede molto più di 4 minuti
     wait_for_stack_ready(stack_name_db) unless stack_ready?(stack_name_db) # dovrebbe essere istantaneo
     db_task = ''
@@ -1337,11 +1353,11 @@ class Release
       },
       {
         parameter_key: "WebHost",
-        parameter_value: get_route53_hostname("ecs-task-web-qa-notneeded")
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       },
       {
         parameter_key: "AssangeHost",
-        parameter_value: get_route53_hostname("ecs-task-assange-qa-notneeded")
+        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_peano)
@@ -1417,11 +1433,11 @@ class Release
       },
       {
         parameter_key: "WebHost",
-        parameter_value: get_route53_hostname('ecs-task-web-qa-notneeded')
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
       },
       {
         parameter_key: "AssangeHost",
-        parameter_value: get_route53_hostname('ecs-task-assange-qa-notneeded')
+        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_assange)
@@ -1583,7 +1599,7 @@ class Release
       },
       {
         parameter_key: "ReleaseVersion",
-        parameter_value: "#{@projects["prima"][:revision]}-#{deploy_id}"
+        parameter_value: "#{@projects["prima"][:revision]}"
       },
       {
         parameter_key: "TaskDesiredCount",
@@ -1616,6 +1632,22 @@ class Release
       {
         parameter_key: "EnvHash",
         parameter_value: deploy_id
+      },
+      {
+        parameter_key: "AssangeHostname",
+        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "BackofficeHostname",
+        parameter_value: "backoffice-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "WebHostname",
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "WebRiHostname",
+        parameter_value: "wwwri-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_web)
@@ -1635,7 +1667,7 @@ class Release
       },
       {
         parameter_key: "ReleaseVersion",
-        parameter_value: "#{@projects["prima"][:revision]}-#{deploy_id}"
+        parameter_value: "#{@projects["prima"][:revision]}"
       },
       {
         parameter_key: "ECSClusterName",
@@ -1644,6 +1676,22 @@ class Release
       {
         parameter_key: "NginxHttpHost",
         parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "AssangeHostname",
+        parameter_value: "assange-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "BackofficeHostname",
+        parameter_value: "backoffice-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "WebHostname",
+        parameter_value: "www-#{@dns_record_identifier}.qa.colaster.com"
+      },
+      {
+        parameter_key: "WebRiHostname",
+        parameter_value: "wwwri-#{@dns_record_identifier}.qa.colaster.com"
       }
     ]
     if stack_exists?(stack_name_consumer)
@@ -1790,6 +1838,8 @@ class Release
       host = "skynet-#{@dns_record_identifier}.qa.colaster.com"
     when stack_name.include?('roger')
       host = "roger-#{@dns_record_identifier}.qa.colaster.com"
+    when stack_name.include?('webri')
+      host = "wwwri-#{@dns_record_identifier}.qa.colaster.com"
     end
     host
   end
@@ -2475,22 +2525,10 @@ class Release
 
     Dir.chdir 'projects/borat'
 
-    if File.readlines("docker-compose.yml").grep(/backend:/).size > 0
-      docker_container = "backend"
-      app_name = "backend"
-    else
-      docker_container = "web"
-      app_name = "borat"
-    end
-
-    stack_name_web = "ecs-task-web-qa-notneeded"
-    web_qa_host = get_route53_hostname(stack_name_web)
-    stack_name_assange = "ecs-task-assange-qa-notneeded"
-    assange_qa_host = get_route53_hostname(stack_name_assange)
-    stack_name_peano = "ecs-task-peano-qa-notneeded"
-    peano_qa_host = "#{get_route53_hostname(stack_name_peano)}:10039"
-    stack_name_borat = "ecs-task-borat-qa-notneeded"
-    borat_qa_host = get_route53_hostname(stack_name_borat)
+    web_qa_host = "www-#{@dns_record_identifier}.qa.colaster.com"
+    assange_qa_host = "assange-#{@dns_record_identifier}.qa.colaster.com"
+    peano_qa_host = "peano-#{@dns_record_identifier}.qa.colaster.com"
+    borat_qa_host = "backoffice-#{@dns_record_identifier}.qa.colaster.com"
 
     ws_endpoint = "wss://#{borat_qa_host}/socket/websocket?vsn=1.0.0"
     frontend_endpoint = "https://#{web_qa_host}/"
@@ -2506,8 +2544,8 @@ class Release
       exec_step 'prepare-docker-compose --directory borat && cp docker-compose-qainit.yml docker-compose.yml'
       [
         "docker network create borat_network || true",
-        "docker-compose build #{docker_container}",
-        "docker-compose run -w $PWD -u root -e WS_ENDPOINT=#{ws_endpoint} -e FRONTEND=#{frontend_endpoint} -e GRAPHQL_ENDPOINT=#{graphiql_endpoint} -e AUTH_ENDPOINT=#{auth_endpoint} -e MIX_ENV=qa --entrypoint /bin/sh #{docker_container} \
+        "docker-compose build web",
+        "docker-compose run -w $PWD -u root -e WS_ENDPOINT=#{ws_endpoint} -e FRONTEND=#{frontend_endpoint} -e GRAPHQL_ENDPOINT=#{graphiql_endpoint} -e AUTH_ENDPOINT=#{auth_endpoint} -e MIX_ENV=qa --entrypoint /bin/sh web \
         '-c' 'sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
         sed -i \"s/assange-qa-host/#{assange_qa_host}/g\" config/qa.exs && \
         sed -i \"s/peano-qa-host/#{peano_qa_host}/g\" config/qa.exs && \
@@ -2531,8 +2569,8 @@ class Release
     else
       [
         "docker network create borat_network || true",
-        "docker-compose build #{docker_container}",
-        "docker run -v $PWD:/code -w /code -e WS_ENDPOINT=#{ws_endpoint} -e FRONTEND=#{frontend_endpoint} -e GRAPHQL_ENDPOINT=#{graphiql_endpoint} -e MIX_ENV=qa --entrypoint /bin/sh borat_#{docker_container} \
+        "docker-compose build web",
+        "docker run -v $PWD:/code -w /code -e WS_ENDPOINT=#{ws_endpoint} -e FRONTEND=#{frontend_endpoint} -e GRAPHQL_ENDPOINT=#{graphiql_endpoint} -e AUTH_ENDPOINT=#{auth_endpoint} -e MIX_ENV=qa --entrypoint /bin/sh web \
         '-c' 'sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
         sed -i \"s/assange-qa-host/#{assange_qa_host}/g\" config/qa.exs && \
         sed -i \"s/peano-qa-host/#{peano_qa_host}/g\" config/qa.exs && \
@@ -2553,11 +2591,7 @@ class Release
       end
     end
 
-    if @qainit
-      artifact_path = Dir.glob("_build/qa/rel/#{app_name}/releases/*/#{app_name}.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/#{app_name}/releases/*/#{app_name}.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/borat/releases/*/borat.tar.gz").first
     upload_artifact(artifact_path, "microservices/borat/#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -2581,7 +2615,7 @@ class Release
     Dir.chdir '../../'
   end
 
-  def create_prima_artifact(revision, branch_name, deploy_id, minimal = false)
+  def create_prima_artifact(revision, branch_name, minimal = false)
     # @projects["prima"][:revision], @projects["prima"][:name], deploy_id, true
     output "Preparo l'artifact prima .zip\n".yellow
 
@@ -2597,33 +2631,23 @@ class Release
       end
     end
 
-    backoffice_qa_host = get_route53_hostname("ecs-task-borat-qa-notneeded")
-    # backoffice-staging.prima.it
-    web_qa_host = get_route53_hostname("ecs-task-web-qa-notneeded")
-    # staging.prima.it
-    assange_qa_host = get_route53_hostname("ecs-task-assange-qa-notneeded")
-    # assange-staging.prima.it
-    if minimal
-      backoffice_qa_host = 'backoffice-staging.prima.it'
-      assange_qa_host = 'assange-staging.prima.it'
-    end
+    # backoffice_qa_host = get_route53_hostname("ecs-task-borat-qa-notneeded")
+    # # backoffice-staging.prima.it
+    # web_qa_host = get_route53_hostname("ecs-task-web-qa-notneeded")
+    # # staging.prima.it
+    # assange_qa_host = get_route53_hostname("ecs-task-assange-qa-notneeded")
+    # # assange-staging.prima.it
+    # if minimal
+    #   backoffice_qa_host = 'backoffice-staging.prima.it'
+    #   assange_qa_host = 'assange-staging.prima.it'
+    # end
 
-    if minimal
-      output "Minimal prima artifact".green
-      exec_step 'mv docker-compose-ci.yml docker-compose.yml'
-      exec_step 'prepare-docker-compose --directory prima'
-      exec_step 'sed -i "s/\\/home\\/app/\\/root/g" docker-compose.yml'
-      [
-        "bin/minimal_local_build_artifact.sh #{branch_name} #{web_qa_host} #{backoffice_qa_host} #{assange_qa_host} #{deploy_id} #{'update' if @deploy_update}"
-      ].each do |cmd|
-        execute_command cmd
-      end
-    elsif @qainit
+    if @qainit
       exec_step 'mv docker-compose-ci.yml docker-compose.yml'
       exec_step 'prepare-docker-compose --directory prima'
       exec_step 'sed -i "s/\\/home\\/app/\\/root/g" docker-compose.yml'
       [
-        "bin/qa_build_artifact.sh #{branch_name} #{web_qa_host} #{backoffice_qa_host} #{assange_qa_host} #{deploy_id} #{'update' if @deploy_update}"
+        "bin/qa_build_artifact.sh #{branch_name} #{'update' if @deploy_update}"
       ].each do |cmd|
         execute_command cmd
       end
@@ -2631,7 +2655,7 @@ class Release
       cleanup_containers
     else
       [
-        "bin/local_build_artifact.sh #{branch_name} #{web_qa_host} #{backoffice_qa_host} #{assange_qa_host} #{deploy_id} #{'update' if @deploy_update}"
+        "bin/local_build_artifact.sh #{branch_name} #{'update' if @deploy_update}"
       ].each do |cmd|
         execute_command cmd
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.44.15
+  version: 0.45.1
 platform: ruby
 authors:
 - Matteo Giachino