prima-twig 0.49.8 → 0.49.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08448e58cf189e51f8c6723d7bfa00bbf33cd5a580910ed85b5433608c05740b'
-  data.tar.gz: 1862eb8e30d80f78d7578b49d323bf0fdeeaa986c43e77e715f0b94b9e89f176
+  metadata.gz: 1bff636a9f9c1f20f7b69dd30238b0d7f31602efd381c99beea50540a7c1713b
+  data.tar.gz: 6ba16118fe7b6fb323a8f9f67d782ec123a490cead2e81750542685a60910075
 SHA512:
-  metadata.gz: 9715c090fd765cb26e3e5f84002ee7ff983f8ba72c4f379b0d7b1e3fc7dfa414fe24fd2f3ead3b2349566ca256cd6fceab5022493a8faffdb8c08e65b006b0f7
-  data.tar.gz: bdeab9b4b293517b54a8878207f2b3e92cbc0cf49b314211480f5b6c990c460586ff2d181c51c1fffa8a74f9a6b78485a3616ca5cf571fdae6a94ba0f5ef1f5b
+  metadata.gz: e5972105a782a7f73f1ce09d7d4f2ff9ef8dce71ce7fbc116300af42fed70dbd1a53a46679ea09bf8105717dbd807b5ac0405b5d5b37a55d8bc0e965c44e4231
+  data.tar.gz: 6744e4e0548e99784e55611ba53e6dc97edc38fa31325d396bac535a4ff51344e2fdf0d2539682aa76d02d8a54fc591ac549c853a585582566df081b447a8aef

data/bin/twig-feature

@@ -765,7 +765,7 @@ class Release
     create_asg_stack(asg_stack_name, tags) unless stack_exists?(asg_stack_name)
 
     deploy_id = calculate_deploy_id
-    create_pyxis_artifact(@projects["pyxis-npm"][:revision], deploy_id)
+    create_pyxis_artifact(@projects["pyxis-npm"][:revision], deploy_id) unless !deploy_pyxis?
     create_prima_artifact(@projects["prima"][:revision], @projects["prima"][:name], deploy_id, true) unless artifact_exists?('prima-artifacts-encrypted', "prima/#{@projects["prima"][:revision]}.tar.gz")
 
     wait_for_stack_ready(stack_name_alb) unless stack_ready?(stack_name_alb)
@@ -938,7 +938,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_pyxis_artifact(@projects["pyxis-npm"][:revision], deploy_id)
+    create_pyxis_artifact(@projects["pyxis-npm"][:revision], deploy_id) unless !deploy_pyxis?
     create_prima_artifact(@projects["prima"][:revision], @projects["prima"][:name], deploy_id) 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
@@ -1985,7 +1985,7 @@ class Release
     when stack_name.include?('rogoreport')
       logical_resource_id = 'ECSServiceRogoreport'
     when stack_name.include?('assange')
-      logical_resource_id = 'ECSServiceAssange'
+      logical_resource_id = 'ECSServiceAssangeQA'
     when stack_name.include?('borat')
       logical_resource_id = 'ECSServiceBorat'
     when stack_name.include?('leftorium')
@@ -1993,7 +1993,7 @@ class Release
     when stack_name.include?('rachele')
       logical_resource_id = 'ECSServiceRacheleQA'
     when stack_name.include?('crash')
-      logical_resource_id = 'ECSServiceCrash'
+      logical_resource_id = 'ECSServiceCrashQA'
     else
       raise "Service name non gestito per lo stack #{stack_name}"
     end
@@ -2154,6 +2154,10 @@ class Release
     Dir.chdir '../../'
   end
 
+  def deploy_pyxis?
+    !@projects['pyxis-npm'].empty? && @projects['pyxis-npm'][:name] != 'master' && !@projects['pyxis-npm'][:default_branch]
+  end
+
   def deploy_crash?
     crash_present = !@projects['crash'].empty? && @projects['crash'][:name] != 'master' && !@projects['crash'][:default_branch]
     leftorium_present = !@projects['leftorium'].empty? && @projects['leftorium'][:name] != 'master' && !@projects['leftorium'][:default_branch]
@@ -2763,8 +2767,7 @@ class Release
     [
       "docker-compose build web",
       "docker-compose run -w $PWD -u root -e NPM_TOKEN=$NPM_TOKEN --entrypoint /bin/sh web \
-      '-c' ' echo $NPM_TOKEN && \
-      yarn install && \
+      '-c' 'yarn install && \
       yarn build:prod && \
       npm publish'"
     ].each do |cmd|
@@ -2773,9 +2776,6 @@ class Release
 
     cleanup_containers
 
-    artifact_path = Dir.glob("_build/qa/rel/pyxis/releases/*/pyxis.tar.gz").first
-    upload_artifact(artifact_path, "microservices/pyxis/#{revision}-qa.tar.gz", "#{@s3_bucket}-encrypted")
-
     Dir.chdir '../../'
   end
 

metadata

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