prima-twig 0.37.6 → 0.37.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d961ad6634eafe94f6abbcca37777211883c7ee
-  data.tar.gz: 25c4205391692d5f9c77c4fd04e8b2b4946c9ac4
+  metadata.gz: cbcc8cf50eb8a89a0370c0dc791d04fdbe9332ee
+  data.tar.gz: b0b72390fd7ee193e0286f27369f0ff7aacae15a
 SHA512:
-  metadata.gz: 9c4796739745b1d9368c8f441be8f5dc1874d1655d953d995eec8b719e58da8ab0fd4aded0e324222e2cb6db1ad4e6518f6242c6b02359e49c7ca21b04127d17
-  data.tar.gz: c02f614527122a168d89827c34bd6391d8a242a2eea34dd9f5369ba485b79463b415489386535f07f96b0558860bfb5b19d3da4c5a6b433cb95e65dc01b82790
+  metadata.gz: f84f1416577c4aa8e01ab1ede88ff1d2ce63f17ad945cc8eb4d5f830de8743867b36dcd888ef7877774938d7b4f46d5b92ba9ea5d0f8c1ba3f294d1aa7ad9409
+  data.tar.gz: 4b06f7bf8d1a4e62c560a0ebe4fe186a4400d83fd90184ef1d2414b7284d5b267c0f3862cf60f619306a64ca60e6224fbd4c1dab8c235f0ca439010146b4e109

data/bin/twig-feature

@@ -759,7 +759,7 @@ class Release
     create_bburago_artifact(@projects["bburago"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/bburago/#{@projects["bburago"][:revision]}-qa.tar.gz")
     create_hal9000_artifact(@projects["hal9000"][:revision]) unless artifact_exists?('prima-artifacts-encrypted', "microservices/hal9000/#{@projects["hal9000"][:revision]}-qa.tar.gz")
     create_fidaty_artifact(@projects["fidaty"][:revision], deploy_id) unless artifact_exists?('prima-artifacts-encrypted', "microservices/fidaty/#{@projects["fidaty"][:revision]}-#{deploy_id}-qa.tar.gz")
-    create_backoffice_artifact(@projects["backoffice"][:revision], deploy_id) unless artifact_exists?('prima-artifacts', "backoffice/#{@projects["backoffice"][:revision]}-#{deploy_id}.zip")
+    create_backoffice_artifact(@projects["backoffice"][:revision], deploy_id, asg_stack_name) unless artifact_exists?('prima-artifacts', "backoffice/#{@projects["backoffice"][:revision]}-#{deploy_id}.zip")
     create_peano_artifact(@projects["peano"][:revision], deploy_id) unless artifact_exists?('prima-artifacts-encrypted', "microservices/peano/#{@projects["peano"][:revision]}-#{deploy_id}-qa.tar.gz")
     create_rogoreport_artifact(@projects["rogoreport"][:revision], deploy_id) unless artifact_exists?('prima-artifacts-encrypted', "microservices/rogoreport/rogoreport_qa-#{@projects["rogoreport"][:revision]}-#{deploy_id}-qa.tar.gz")
     create_assange_artifact(@projects["assange"][:revision], deploy_id) unless artifact_exists?('prima-artifacts-encrypted', "microservices/assange/#{@projects["assange"][:revision]}-#{deploy_id}-qa.tar.gz")
@@ -2318,7 +2318,7 @@ class Release
     Dir.chdir '../../'
   end
 
-  def create_backoffice_artifact(revision, deploy_id)
+  def create_backoffice_artifact(revision, deploy_id, asg_stack_name)
     output "Preparo l'artifact backoffice .zip\n".yellow
 
     git_checkout_version('backoffice', revision)
@@ -2337,6 +2337,8 @@ class Release
     web_qa_host = get_route53_hostname(stack_name_web)
     webri_qa_host = web_qa_host.sub("www", "wwwri")
 
+    ip_qa_host = ec2_ip_address(asg_stack_name)
+
     if @qainit
       exec_step 'cp docker-compose-ci.yml docker-compose.yml'
       exec_step 'prepare-docker-compose --directory backoffice && cp docker-compose-qainit.yml docker-compose.yml'
@@ -2344,7 +2346,7 @@ class Release
         "docker-compose build workers",
         "docker-compose build bower",
         "docker-compose run -e GIT_DIR=$PWD -w $PWD bower install --allow-root",
-        "docker-compose run -w $PWD -e PHANTOMJS_BIN=/code/node_modules/grunt-selenium-webdriver/node_modules/phantomjs/bin/phantomjs --entrypoint /bin/bash workers '-c' 'sed -i \"s/web-qa-url/#{web_qa_host}/g\" Gruntfile.js && sed -i \"s/web-qa-ri-url/#{webri_qa_host}/g\" Gruntfile.js && npm install && grunt qa'"
+        "docker-compose run -w $PWD -e PHANTOMJS_BIN=/code/node_modules/grunt-selenium-webdriver/node_modules/phantomjs/bin/phantomjs --entrypoint /bin/bash workers '-c' 'sed -i \"s/web-qa-url/#{web_qa_host}/g\" Gruntfile.js && sed -i \"s/web-qa-ri-url/#{webri_qa_host}/g\" Gruntfile.js && sed -i \"s/qa-ip/#{ip_qa_host}/g\" Gruntfile.js && npm install && grunt qa'"
       ].each do |cmd|
         execute_command cmd
       end
@@ -2545,6 +2547,7 @@ class Release
     if select_master
       branch_name = master_branch
     else
+      branches.insert(0, branches.delete(master_branch))
       branch_name = choose do |menu|
         menu.prompt = "Scegli il branch di #{project_name} da deployare: ".cyan
         menu.shell  = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prima-twig
 version: !ruby/object:Gem::Version
-  version: 0.37.6
+  version: 0.37.7
 platform: ruby
 authors:
 - Matteo Giachino
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk