From b14775d90f327a61b9660518951229bca4c82a1c Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 14 Jun 2019 09:42:49 +0200 Subject: [PATCH 1/2] deploy 1.1.4 --- eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml b/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml index 133b1d98..e36c1dee 100644 --- a/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml +++ b/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml @@ -24,7 +24,7 @@ eidastest_compose: - HUB_PORT_4444_TCP_PORT=4444 eidastest-testid: - image: docker.sunet.se/eidastest-testid:1.1.3 + image: docker.sunet.se/eidastest-testid:1.1.4 container_name: eidastest-testid ports: - "443:8099" From f1f29b44bf1c8416b53e1ae9190a0e1c33c957c3 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Fri, 14 Jun 2019 09:45:33 +0200 Subject: [PATCH 2/2] wait a bit before update --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 66d87b78..25f8b508 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -400,10 +400,12 @@ class eidastest($version="1.0.0", $hostname="locahost") { content => inline_template("<%= @compose.to_yaml %>\n") } -> exec { 'launch_test_prod': - command => "wget --no-check-certificate -qO- https://localhost/testid/prod/execution-interval/7" + command => "sleep 60 && wget --no-check-certificate -qO- https://localhost/testid/prod/execution-interval/7", + refreshonly => true } -> exec { 'launch_test_qa': - command => "wget --no-check-certificate -qO- https://localhost/testid/qa/execution-interval/27" + command => "sleep 60 && wget --no-check-certificate -qO- https://localhost/testid/qa/execution-interval/17", + refreshonly => true } ensure_resource('class','webserver',{}) ensure_resource('class','https_server',{})