prima-twig 0.31.4 → 0.31.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/twig-feature +9 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e0e48c4fd785ecbbca3180861e3151de5e0263b8
|
|
4
|
+
data.tar.gz: 400a98358be55f95e0e7a1812172d653f276ebce
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f27ea87cfa0a5a49bcb14c87158bbf3826f7824a77fa0672fc31ce7b451da9f4f6ef9749410ecdf58719ea8868f4e6621baedd6657bbd29521a960dc5d54a098
|
|
7
|
+
data.tar.gz: ceb8eddc0dabc3b62056959aad538df32348a00ecde6fe3ba13a1b932b9826372a2f2a92588e1d6d3ab55d083a5b8896268cfcd3b1228a5f15e9cf1be49b15fd
|
data/bin/twig-feature
CHANGED
|
@@ -489,7 +489,7 @@ class Release
|
|
|
489
489
|
wait_for_stack_ready(stack_name_db) unless stack_ready?(stack_name_db)
|
|
490
490
|
import_dbs(ec2_ip_address(asg_stack_name)) unless stack_exists?("ecs-task-web-qa-#{deploy_id}")
|
|
491
491
|
|
|
492
|
-
import_redis_crash(ec2_ip_address(asg_stack_name))
|
|
492
|
+
import_redis_crash(ec2_ip_address(asg_stack_name)) if deploy_crash?
|
|
493
493
|
|
|
494
494
|
wait_for_stack_ready(@stack_name_alb) unless stack_ready?(@stack_name_alb)
|
|
495
495
|
wait_for_stack_ready(@stack_name_alb_ws) unless stack_ready?(@stack_name_alb_ws)
|
|
@@ -1109,7 +1109,7 @@ class Release
|
|
|
1109
1109
|
|
|
1110
1110
|
wait_for_stack_ready(stack_name_route53) unless stack_ready?(stack_name_route53)
|
|
1111
1111
|
|
|
1112
|
-
launch_marley
|
|
1112
|
+
launch_marley ec2_ip_address(asg_stack_name)
|
|
1113
1113
|
|
|
1114
1114
|
projects_text = "
|
|
1115
1115
|
> Prima url: https://#{prima_hostname}
|
|
@@ -1825,7 +1825,7 @@ class Release
|
|
|
1825
1825
|
(Time.now.to_i.to_s[-4..-1].to_i + Random.rand(40000)).to_s
|
|
1826
1826
|
end
|
|
1827
1827
|
|
|
1828
|
-
def launch_marley
|
|
1828
|
+
def launch_marley(ip_address)
|
|
1829
1829
|
resp = @cf.describe_stack_resource({
|
|
1830
1830
|
stack_name: 'batch-job-marley',
|
|
1831
1831
|
logical_resource_id: 'JobDefinition'
|
|
@@ -1833,13 +1833,17 @@ class Release
|
|
|
1833
1833
|
|
|
1834
1834
|
@batch.submit_job({
|
|
1835
1835
|
job_name: "marley-#{@dns_record_identifier}", # required
|
|
1836
|
-
job_queue:
|
|
1836
|
+
job_queue: 'marley', # required
|
|
1837
1837
|
job_definition: resp.stack_resource_detail.physical_resource_id, # required
|
|
1838
1838
|
container_overrides: {
|
|
1839
1839
|
environment: [
|
|
1840
1840
|
{
|
|
1841
1841
|
name: 'PRIMA_URL',
|
|
1842
|
-
value: "https://#{get_route53_hostname(
|
|
1842
|
+
value: "https://#{get_route53_hostname('ecs-task-web-qa-notneeded')}/"
|
|
1843
|
+
},
|
|
1844
|
+
{
|
|
1845
|
+
name: 'PRIMA_IP',
|
|
1846
|
+
value: ip_address
|
|
1843
1847
|
},
|
|
1844
1848
|
{
|
|
1845
1849
|
name: 'PROJECTS_JSON',
|