prima-twig 0.36.70 → 0.36.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a751182caae21269a73216d8cc3c527032cb7cd
-  data.tar.gz: f77d0785940f4e5c8c822fb128a7cf694e44eaac
+  metadata.gz: 3cb596d68ce96531baa1721e0866ad4f57639ae9
+  data.tar.gz: 0fae67f256bc4a81763296043e2159712b485ea5
 SHA512:
-  metadata.gz: 6d704b183ee8ce45d256def6fe6d3240548cacd768dab9994ba7d16a1d82b4e48b2f158a3ba756718c6b23698ea3ec6e27f1448242f603a0d323fb6aa8e83830
-  data.tar.gz: 2597e644070831c1ceee15a915d040753cc2c4d3d82f0fa654497412bc6b4c7a58f1dd35303c3790d6f5557dc35d1956abadbfd824995fd737aa57d3ce8e5608
+  metadata.gz: 72ad55b61a19fbff9cc81d28a544c07a6433bd61f38164b5d6ccc42ef6f562e716076ed0592ba4505d7dace4bff1aa3d7e2a07819c978e9e048533a389d9b63b
+  data.tar.gz: ae951fd7b725f4db1d444e64ed619d2749518934fcd90e85f0c6e0c2df1a8c4964187056881d2188486712742d6029cd28cde5e57700c5f4e76e8bcdd1f7c805

data/bin/twig-feature

@@ -421,7 +421,6 @@ class Release
     `git checkout master`
 
     if `git branch -l | grep #{feature_number}`.size > 0
-      # `git push -f origin #{feature_number} && git branch -d #{feature_number}`
       `git checkout #{feature_number} && git pull`
     else
       `git checkout -b #{feature_number}`
@@ -431,7 +430,6 @@ class Release
 
     @projects.each_key do |project_key|
       if @projects[project_key][:revision]
-        # git_checkout_version(project_key, @projects[project_key][:revision])
         branches += "#{project_key}:#{@projects[project_key][:name]}:#{@projects[project_key][:revision]}:#{@projects[project_key][:default_branch]}\n"
       end
     end
@@ -473,7 +471,6 @@ class Release
         project = line.split(':')
         @projects[project[0]] = select_branch_to_deploy(project[0], project[1])
         @projects[project[0]][:default_branch] = project[3]
-        # @projects[project[0]] = {:name=> project[1], :revision=> project[2], :default_branch=> project[3]}
       end
     end
 
@@ -481,7 +478,6 @@ class Release
 
     @projects.each_key do |project_key|
       if @projects[project_key][:revision]
-        # git_checkout_version(project_key, @projects[project_key][:revision])
         branches += "#{project_key}:#{@projects[project_key][:name]}:#{@projects[project_key][:revision]}:#{@projects[project_key][:default_branch]}"
       end
     end
@@ -660,9 +656,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")
-    # unless @qainit
-      create_backoffice_artifact(@projects["backoffice"][:revision], deploy_id) unless artifact_exists?('prima-artifacts', "backoffice/#{@projects["backoffice"][:revision]}-#{deploy_id}.zip")
-    # end
+    create_backoffice_artifact(@projects["backoffice"][:revision], deploy_id) 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")
@@ -1567,7 +1561,6 @@ class Release
     execute_command "docker-compose build web"
 
     if @qainit
-      execute_command 'pwd && ls -l && ls config'
       [ "docker-compose run -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
         '-c' 'mix local.hex --force && mix hex.info && \
         mix deps.get && mix compile && mix deps.compile && \
@@ -1587,12 +1580,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob("_build/qa/rel/urania/releases/*/urania.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/urania/releases/*/urania.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/urania/releases/*/urania.tar.gz").first
     upload_artifact(artifact_path, "microservices/urania/#{revision}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -1627,10 +1615,8 @@ class Release
     end
 
     if @qainit
-      execute_command 'pwd && ls -l && ls config'
       [ "docker-compose run --rm -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
-        '-c' 'pwd && ls -la && \
-        sed -i \"s/peano-qa-host/#{peano_qa_host}/g\" config/qa.exs && \
+        '-c' 'sed -i \"s/peano-qa-host/#{peano_qa_host}/g\" config/qa.exs && \
         sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
         mix local.hex --force && mix hex.info && \
         mix deps.get && mix compile && mix deps.compile && \
@@ -1660,12 +1646,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob("_build/qa/rel/ermes/releases/*/ermes.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/ermes/releases/*/ermes.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/ermes/releases/*/ermes.tar.gz").first
     upload_artifact(artifact_path, "microservices/ermes/#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -1693,9 +1674,7 @@ class Release
     decrypt_secrets()
 
     if @qainit
-      # exec_step 'cp docker-compose.yml docker-compose-ci.yml'
       exec_step 'prepare-docker-compose --directory crash && cp docker-compose-qainit.yml docker-compose.yml'
-        # "docker-compose run -v /var/cache/ci/primait/qainit/master/project/projects/crash/:/code -w /code -u root -e WS_ENDPOINT=#{ws_endpoint} -e GRAPHQL_ENDPOINT=#{frontend_endpoint} -e MIX_ENV=qa crash_web \
       [
         'docker-compose build web',
         "docker-compose run -w $PWD -u root -e WS_ENDPOINT=#{ws_endpoint} -e GRAPHQL_ENDPOINT=#{frontend_endpoint} -e MIX_ENV=qa web \
@@ -1742,13 +1721,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob('_build/qa/rel/crash/releases/*/crash.tar.gz').first
-      # artifact_path = Dir.glob("/var/cache/ci/project/projects/crash/_build/qa/rel/crash/releases/*/crash.tar.gz").first
-    else
-      artifact_path = Dir.glob('_build/qa/rel/crash/releases/*/crash.tar.gz').first
-    end
+    artifact_path = Dir.glob('_build/qa/rel/crash/releases/*/crash.tar.gz').first
     upload_artifact(artifact_path, "microservices/crash/#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -1789,12 +1762,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob('_build/qa/rel/bburago/releases/*/bburago.tar.gz').first
-    else
-      artifact_path = Dir.glob('_build/qa/rel/bburago/releases/*/bburago.tar.gz').first
-    end
+    artifact_path = Dir.glob('_build/qa/rel/bburago/releases/*/bburago.tar.gz').first
     upload_artifact(artifact_path, "microservices/bburago/#{revision}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -1837,12 +1805,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob("_build/qa/rel/hal9000/releases/*/hal9000.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/hal9000/releases/*/hal9000.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/hal9000/releases/*/hal9000.tar.gz").first
     upload_artifact(artifact_path, "microservices/hal9000/#{revision}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -1895,12 +1858,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob("_build/qa/rel/fidaty/releases/*/fidaty.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/fidaty/releases/*/fidaty.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/fidaty/releases/*/fidaty.tar.gz").first
     upload_artifact(artifact_path, "microservices/fidaty/#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -1928,8 +1886,7 @@ class Release
       [
         "docker-compose build web", 
         "docker-compose run -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
-        '-c' 'pwd && ls -la && \
-        mix local.hex --force && mix hex.info && \
+        '-c' 'mix local.hex --force && mix hex.info && \
         sed -i \"s/assange-qa-host/#{assange_qa_host}/g\" config/qa.exs && \
         sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
         mix deps.get && mix compile && mix deps.compile && \
@@ -1953,12 +1910,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob("_build/qa/rel/peano/releases/*/peano.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/peano/releases/*/peano.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/peano/releases/*/peano.tar.gz").first
     upload_artifact(artifact_path, "microservices/peano/#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -2010,12 +1962,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob("_build/qa/rel/rogoreport*/releases/*/rogoreport*.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/rogoreport*/releases/*/rogoreport*.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/rogoreport*/releases/*/rogoreport*.tar.gz").first
     upload_artifact(artifact_path, "microservices/rogoreport/rogoreport_qa-#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -2063,12 +2010,7 @@ class Release
       end
     end
 
-    if @qainit
-      execute_command 'pwd && ls -l'
-      artifact_path = Dir.glob("_build/qa/rel/assange/releases/*/assange.tar.gz").first
-    else
-      artifact_path = Dir.glob("_build/qa/rel/assange/releases/*/assange.tar.gz").first
-    end
+    artifact_path = Dir.glob("_build/qa/rel/assange/releases/*/assange.tar.gz").first
     upload_artifact(artifact_path, "microservices/assange/#{revision}-#{deploy_id}-qa.tar.gz", "#{@s3_bucket}-encrypted")
 
     Dir.chdir '../../'
@@ -2094,12 +2036,8 @@ class Release
       exec_step 'prepare-docker-compose --directory activia && cp docker-compose-qainit.yml docker-compose.yml'
       [
         "docker-compose build web",
-        "cat docker-compose-ci.yml",
-        "cat docker-compose-qainit.yml",
-        "cat docker-compose.yml",
         "docker-compose run -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
-        '-c' 'pwd && ls -al && \
-        sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
+        '-c' 'sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
         sed -i \"s/peano-qa-host/#{peano_qa_host}/g\" config/qa.exs && \
         mix local.hex --force && mix hex.info && \
         mix deps.get && mix compile && mix deps.compile && \
@@ -2149,7 +2087,6 @@ class Release
       exec_step 'cp docker-compose.yml docker-compose-ci.yml'
       exec_step 'prepare-docker-compose --directory bolla && cp docker-compose-qainit.yml docker-compose.yml'
       [ 
-        "pwd && cat docker-compose.yml",
         "docker-compose build web",
         "docker-compose run -w $PWD -u root -e MIX_ENV=qa --entrypoint /bin/sh web \
         '-c' 'mix local.hex --force && mix hex.info && \
@@ -2162,7 +2099,7 @@ class Release
     else
       [
         "docker-compose build web",
-        "docker run -v $PWD:/code -w /code -e MIX_ENV=qa --entrypoint /bin/sh assange_web \
+        "docker run -v $PWD:/code -w /code -e MIX_ENV=qa --entrypoint /bin/sh bolla_web \
         '-c' 'mix local.hex --force && mix hex.info && \
         mix deps.get && mix compile && mix deps.compile && \
         rm -rf _build/qa/rel/ && \
@@ -2211,8 +2148,7 @@ class Release
     if @qainit
       exec_step 'cp docker-compose.yml docker-compose-ci.yml'
       exec_step 'prepare-docker-compose --directory borat && cp docker-compose-qainit.yml docker-compose.yml'
-      [ 
-        "pwd && cat docker-compose.yml",
+      [
         "docker-compose build backend",
         "docker-compose run -w $PWD -u root -e WS_ENDPOINT=#{ws_endpoint} -e FRONTEND=#{frontend_endpoint} -e MIX_ENV=qa --entrypoint /bin/sh backend \
         '-c' 'sed -i \"s/web-qa-host/#{web_qa_host}/g\" config/qa.exs && \
@@ -2260,7 +2196,6 @@ class Release
     end
 
     if @qainit
-      execute_command 'pwd && ls -l'
       artifact_path = Dir.glob("_build/qa/rel/backend/releases/*/backend.tar.gz").first
     else
       artifact_path = Dir.glob("_build/qa/rel/backend/releases/*/backend.tar.gz").first
@@ -2300,7 +2235,6 @@ class Release
       [
         "docker-compose build workers",
         "docker-compose build bower",
-        # "rm -rf src/ && git checkout -- .",
         "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'"
       ].each do |cmd|
@@ -2317,15 +2251,6 @@ class Release
       end
     end
 
-    if @qainit
-      # artifact_path = Dir.glob("/var/cache/ci/project/projects/borat/_build/qa/rel/backend/releases/*/backend.tar.gz").first
-      execute_command 'pwd && ls -l'
-      # execute_command 'ls -l /var/cache/ci'
-      # execute_command 'ls -l /var/cache/ci/project'
-      # execute_command 'ls -l /var/cache/ci/project/projects'
-      # execute_command 'ls -l /var/cache/ci/project/projects/backoffice'
-      # execute_command 'sudo cd /var/cache/ci/project/projects/backoffice'
-    end
     artifact_path = '/tmp/backoffice.zip'
     exec_step "rm -f #{artifact_path} && zip -9 -r #{artifact_path} bin/"
     upload_artifact(artifact_path, "backoffice/#{revision}-#{deploy_id}.zip")

data/bin/twig-update-ami

@@ -30,7 +30,7 @@ class TwigUpdateAmi
 
   def update_amis(ami_id, ami_name, ami_description, only_staging)
     @instances['amis'].each do |ami|
-      if only_staging and ami['json'] != 'ecs.json'
+      if only_staging and ami['json'] != 'ecs-allinone.json'
         output "skipping #{ami['json']} because only_staging enabled".yellow
         next
       end

metadata

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