prima-twig 0.59.1 → 0.59.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/twig-feature +26 -26
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2abda8e5271eec5c976b6237737265ebc0d731a826752820bc20fe44e20c4df3
|
|
4
|
+
data.tar.gz: 213b7bdca8578bc3670783246419ddbc6906b19138d2f99eccc45aeceb50db7c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b14b4e65cdd4774cec9d696e781cedede149bc3802c6d20448f46b2658f5a68de821101df1db4d4c284c383bc42224e7b706862e04c9fe677790c686ed0e2d47
|
|
7
|
+
data.tar.gz: d3e796bf5b63ea87da3f2d5c7d5360aacdb64340e6d86247d1b08c42e3bba2a586a6464c418c2a9f89a04930ce20432682d9f2142b47d389fcc6f51c29a285d9
|
data/bin/twig-feature
CHANGED
|
@@ -90,8 +90,6 @@ class Release
|
|
|
90
90
|
if 'deploy' == args[1]
|
|
91
91
|
suite_py_branches(args[2])
|
|
92
92
|
qainit_deploy!(true)
|
|
93
|
-
else
|
|
94
|
-
qainit_deploy_shutdown!(args[2])
|
|
95
93
|
end
|
|
96
94
|
when 'deploy'
|
|
97
95
|
abort('Non sei nella cartella di artemide') unless Dir.pwd.match 'artemide$'
|
|
@@ -894,8 +892,8 @@ class Release
|
|
|
894
892
|
case key.to_s
|
|
895
893
|
when 'crash'
|
|
896
894
|
tags << { key: 'crash', value: @projects['crash']['name'] } if deploy_crash?
|
|
897
|
-
when 'starsky', 'hutch'
|
|
898
|
-
tags << { key: key.to_s, value: @projects[key.to_s]['name'] } if
|
|
895
|
+
when 'starsky', 'hutch'
|
|
896
|
+
tags << { key: key.to_s, value: @projects[key.to_s]['name'] } if deploy_starsky_hutch?
|
|
899
897
|
else
|
|
900
898
|
tags << { key: key, value: value['name'] }
|
|
901
899
|
end
|
|
@@ -960,9 +958,10 @@ class Release
|
|
|
960
958
|
create_activia_artifact(@projects["activia"]['revision']) unless artifact_exists?('prima-artifacts-encrypted', "microservices/activia/#{@projects["activia"]['revision']}-qa.tar.gz")
|
|
961
959
|
create_leftorium_artifact(@projects["leftorium"]['revision']) unless artifact_exists?('prima-artifacts-encrypted', "microservices/leftorium/#{@projects["leftorium"]['revision']}-qa.tar.gz")
|
|
962
960
|
create_skynet_artifact(@projects["skynet"]['revision']) unless artifact_exists?('prima-artifacts-encrypted', "microservices/skynet/#{@projects["skynet"]['revision']}-qa.tar.gz")
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
961
|
+
create_maia_artifact(@projects["maia"]['revision']) unless artifact_exists?('prima-artifacts-encrypted', "microservices/maia/#{@projects["maia"]['revision']}-qa.tar.gz")
|
|
962
|
+
create_starsky_artifact(@projects["starsky"]['revision']) unless !deploy_starsky_hutch? || artifact_exists?('prima-artifacts-encrypted', "microservices/starsky/#{@projects["starsky"]['revision']}-qa.tar.gz")
|
|
963
|
+
create_hutch_artifact(@projects["hutch"]['revision']) unless !deploy_starsky_hutch? || artifact_exists?('prima-artifacts-encrypted', "microservices/hutch/#{@projects["hutch"]['revision']}-qa.tar.gz")
|
|
964
|
+
|
|
966
965
|
|
|
967
966
|
wait_for_db_import(db_task) unless stack_exists?("ecs-route53-qa-#{deploy_id}") # dovrebbe essere istantaneo
|
|
968
967
|
|
|
@@ -1605,7 +1604,7 @@ class Release
|
|
|
1605
1604
|
end
|
|
1606
1605
|
end
|
|
1607
1606
|
|
|
1608
|
-
if
|
|
1607
|
+
if deploy_starsky_hutch?
|
|
1609
1608
|
stack_name_starsky = "ecs-task-starsky-qa-#{deploy_id}"
|
|
1610
1609
|
git_checkout_version('starsky', @projects["starsky"]['revision'])
|
|
1611
1610
|
stack_body = IO.read('projects/starsky/deploy/task.yml')
|
|
@@ -1862,8 +1861,8 @@ class Release
|
|
|
1862
1861
|
end
|
|
1863
1862
|
|
|
1864
1863
|
|
|
1865
|
-
if
|
|
1866
|
-
wait_for_stack_ready(stack_name_starsky) unless stack_ready?(stack_name_starsky) unless !
|
|
1864
|
+
if deploy_starsky_hutch?
|
|
1865
|
+
wait_for_stack_ready(stack_name_starsky) unless stack_ready?(stack_name_starsky) unless !deploy_starsky_hutch?
|
|
1867
1866
|
|
|
1868
1867
|
stack_name_hutch = "ecs-task-hutch-qa-#{deploy_id}"
|
|
1869
1868
|
git_checkout_version('hutch', @projects["hutch"]['revision'])
|
|
@@ -1966,9 +1965,10 @@ class Release
|
|
|
1966
1965
|
wait_for_stack_ready(stack_name_rogoreport) unless stack_ready?(stack_name_rogoreport)
|
|
1967
1966
|
wait_for_stack_ready(stack_name_borat) unless stack_ready?(stack_name_borat)
|
|
1968
1967
|
wait_for_stack_ready(stack_name_activia) unless stack_ready?(stack_name_activia)
|
|
1968
|
+
wait_for_stack_ready(stack_name_maia) unless stack_ready?(stack_name_maia)
|
|
1969
1969
|
wait_for_stack_ready(stack_name_crash) unless stack_ready?(stack_name_crash) unless !deploy_crash?
|
|
1970
|
-
wait_for_stack_ready(stack_name_hutch) unless stack_ready?(stack_name_hutch) unless !
|
|
1971
|
-
|
|
1970
|
+
wait_for_stack_ready(stack_name_hutch) unless stack_ready?(stack_name_hutch) unless !deploy_starsky_hutch?
|
|
1971
|
+
|
|
1972
1972
|
|
|
1973
1973
|
update_service_defaults(stack_name_web)
|
|
1974
1974
|
update_service_defaults(stack_name_consumer)
|
|
@@ -1985,9 +1985,9 @@ class Release
|
|
|
1985
1985
|
update_service_defaults(stack_name_skynet)
|
|
1986
1986
|
update_service_defaults(stack_name_leftorium)
|
|
1987
1987
|
update_service_defaults(stack_name_rachele)
|
|
1988
|
-
update_service_defaults(
|
|
1989
|
-
update_service_defaults(
|
|
1990
|
-
update_service_defaults(
|
|
1988
|
+
update_service_defaults(stack_name_maia)
|
|
1989
|
+
update_service_defaults(stack_name_starsky) unless !deploy_starsky_hutch?
|
|
1990
|
+
update_service_defaults(stack_name_hutch) unless !deploy_starsky_hutch?
|
|
1991
1991
|
update_service_defaults(stack_name_crash) unless !deploy_crash?
|
|
1992
1992
|
|
|
1993
1993
|
activia_hostname = get_route53_hostname("activia")
|
|
@@ -2004,11 +2004,12 @@ class Release
|
|
|
2004
2004
|
roger_hostname = get_route53_hostname("roger")
|
|
2005
2005
|
leftorium_hostname = get_route53_hostname("leftorium")
|
|
2006
2006
|
rachele_hostname = get_route53_hostname("rachele")
|
|
2007
|
+
maia_app_hostname = get_route53_hostname("maia-app")
|
|
2008
|
+
maia_intermediari_hostname = get_route53_hostname("maia-intermediari")
|
|
2007
2009
|
crash_hostname = get_route53_hostname("crash") unless !deploy_crash?
|
|
2008
|
-
starsky_hostname = get_route53_hostname("starsky") unless !
|
|
2009
|
-
hutch_hostname = get_route53_hostname("hutch") unless !
|
|
2010
|
-
|
|
2011
|
-
maia_intermediari_hostname = get_route53_hostname("maia-intermediari") unless !deploy_starsky_hutch_maia?
|
|
2010
|
+
starsky_hostname = get_route53_hostname("starsky") unless !deploy_starsky_hutch?
|
|
2011
|
+
hutch_hostname = get_route53_hostname("hutch") unless !deploy_starsky_hutch?
|
|
2012
|
+
|
|
2012
2013
|
|
|
2013
2014
|
# launch_marley ec2_ip_address(asg_stack_name), prima_hostname, borat_hostname
|
|
2014
2015
|
|
|
@@ -2026,14 +2027,14 @@ class Release
|
|
|
2026
2027
|
> Skynet url: http://#{skynet_hostname}:8050
|
|
2027
2028
|
> Roger url: http://#{roger_hostname}:10051
|
|
2028
2029
|
> Leftorium url: http://#{leftorium_hostname}:10061
|
|
2029
|
-
> Rachele url: http://#{rachele_hostname}:10040
|
|
2030
|
+
> Rachele url: http://#{rachele_hostname}:10040
|
|
2031
|
+
> Maia App url: https://#{maia_app_hostname}
|
|
2032
|
+
> Maia Intermediari url: https://#{maia_intermediari_hostname}"
|
|
2030
2033
|
projects_text.concat "
|
|
2031
2034
|
> Crash url: https://#{crash_hostname}" if deploy_crash?
|
|
2032
2035
|
projects_text.concat "
|
|
2033
2036
|
> Starsky url: https://#{starsky_hostname}
|
|
2034
|
-
> Hutch url: https://#{hutch_hostname}
|
|
2035
|
-
> Maia App url: https://#{maia_app_hostname}
|
|
2036
|
-
> Maia Intermediari url: https://#{maia_intermediari_hostname}" if deploy_starsky_hutch_maia?
|
|
2037
|
+
> Hutch url: https://#{hutch_hostname}" if deploy_starsky_hutch?
|
|
2037
2038
|
projects_text.concat "
|
|
2038
2039
|
> RabbitMQ url: http://#{ec2_ip_address(asg_stack_name)}:15672
|
|
2039
2040
|
> Supervisor url: http://#{ec2_ip_address(asg_stack_name)}:9001
|
|
@@ -2846,11 +2847,10 @@ class Release
|
|
|
2846
2847
|
crash_present || leftorium_present
|
|
2847
2848
|
end
|
|
2848
2849
|
|
|
2849
|
-
def
|
|
2850
|
+
def deploy_starsky_hutch?
|
|
2850
2851
|
starsky_present = !@projects['starsky'].nil? && !@projects['starsky'].empty? && @projects['starsky']['name'] != 'master' && !@projects['starsky']['default_branch']
|
|
2851
2852
|
hutch_present = !@projects['hutch'].nil? && !@projects['hutch'].empty? && @projects['hutch']['name'] != 'master' && !@projects['hutch']['default_branch']
|
|
2852
|
-
|
|
2853
|
-
starsky_present || hutch_present || maia_present
|
|
2853
|
+
starsky_present || hutch_present
|
|
2854
2854
|
end
|
|
2855
2855
|
|
|
2856
2856
|
def get_pyxis_version(deploy_id)
|