From ca3ffcb4ab1e4eed3519559a9b6ab0df98cc115d Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 11:51:16 +0530 Subject: [PATCH 01/16] fix jenkinsfile --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cbbc9617..4a991f2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { } stage('ecr push') { when { - branch 'master' + branch 'testci' } steps { sh '''eval sudo $(aws ecr get-login --no-include-email --region us-west-2) @@ -49,7 +49,7 @@ sudo docker push $AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${VERSIO } stage('deploy to stg') { when { - branch 'master' + branch 'testci' } steps { sh ''' @@ -63,7 +63,7 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } stage('stg test execution ') { when { - branch 'master' + branch 'testci' } steps { sh './int_test.sh' @@ -71,7 +71,7 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } stage('deploy to prod') { when { - branch 'master' + branch 'testci' } steps { sh 'echo "this will deploy to next env"' From 8aee30398ccdac14a04adee0022bb2ed898cb0f6 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 17:43:35 +0530 Subject: [PATCH 02/16] test rollback --- Jenkinsfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4a991f2d..4e41a959 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,6 +59,9 @@ latest_tag=$(aws ecr describe-images --repository-name ssoweb --region us-west-2 sleep 60 fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --namespace=dev --update-image=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${latest_tag} ''' + script { + env.DEPLOY_STG_STATUS = "true" + } } } stage('stg test execution ') { @@ -78,6 +81,14 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } } } + post { + success { + echo '${BAR}' + } + failure { + echo '${BAR}' + } + } triggers { pollSCM('* * * * *') } From 75a3abea245e1f1e68f7fc5700ffd7dedbef9da2 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 17:54:56 +0530 Subject: [PATCH 03/16] fix pipeline --- Jenkinsfile | 4 ++-- int_test.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4e41a959..0e60775d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,10 +83,10 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } post { success { - echo '${BAR}' + echo "env.BAR su '${BAR}'" } failure { - echo '${BAR}' + echo "env.BAR is '${BAR}'" } } triggers { diff --git a/int_test.sh b/int_test.sh index d287cfa4..a487fb28 100755 --- a/int_test.sh +++ b/int_test.sh @@ -1,7 +1,7 @@ #!/bin/bash # added a sleep since kubernets deployment can take time to propogate -sleep 60 +#sleep 60 test_result=$(curl -s -o /dev/null -w "%{http_code}" http://rubycas.k8.bebraven.org/login) From 1b45e98462f5b5a3f2a56cc41e1e1724f2b62192 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 18:18:57 +0530 Subject: [PATCH 04/16] fix pipeline --- Jenkinsfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e60775d..42160468 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,10 +83,16 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } post { success { - echo "env.BAR su '${BAR}'" + steps { + echo "sucess" + echo "env.BAR su '${BAR}'" + } } failure { - echo "env.BAR is '${BAR}'" + steps { + echo "fail" + echo "env.BAR fail '${BAR}'" + } } } triggers { From 341b3a421d9df15cba94c525f66b5d5113052959 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 18:27:28 +0530 Subject: [PATCH 05/16] fix pipeline --- Jenkinsfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 42160468..0c0dd196 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,16 +83,10 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } post { success { - steps { - echo "sucess" - echo "env.BAR su '${BAR}'" - } + echo 'whole pipeline successful' } failure { - steps { - echo "fail" - echo "env.BAR fail '${BAR}'" - } + echo 'whole pipeline fail' } } triggers { From a7294ddc4a79276e4061bd5ad58244d515a3c439 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 18:37:18 +0530 Subject: [PATCH 06/16] test --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0c0dd196..97db0887 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,10 +83,14 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } post { success { - echo 'whole pipeline successful' + steps { + echo "sucess" + } } failure { - echo 'whole pipeline fail' + steps { + echo "fail" + } } } triggers { From 44b6c7a8d6fe9b0e25ecbbd7f0f79eb050a2451a Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 18:41:54 +0530 Subject: [PATCH 07/16] fix --- Jenkinsfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 97db0887..c3e59daa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,14 +83,12 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } post { success { - steps { - echo "sucess" - } + sh 'env' + echo "FOO is '${DEPLOY_STG_STATUS}'" } failure { - steps { - echo "fail" - } + sh 'env' + echo "FOO is '${DEPLOY_STG_STATUS}'" } } triggers { From ae707f0c57565bc902def94501a336ab54b3fb13 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 18:47:14 +0530 Subject: [PATCH 08/16] test fail --- int_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/int_test.sh b/int_test.sh index a487fb28..fa725efa 100755 --- a/int_test.sh +++ b/int_test.sh @@ -3,7 +3,7 @@ # added a sleep since kubernets deployment can take time to propogate #sleep 60 -test_result=$(curl -s -o /dev/null -w "%{http_code}" http://rubycas.k8.bebraven.org/login) +test_result=$(curl -s -o /dev/null -w "%{http_code}" http://rubycas.k8.bebraven.org1/login) echo $test_result if [ $test_result == 200 ] From 1ae4dcf6da90660c1ad32fdd935d3aea2a04fd71 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 19:27:21 +0530 Subject: [PATCH 09/16] fix 1 --- Jenkinsfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c3e59daa..500f8bae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,11 +56,12 @@ sudo docker push $AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${VERSIO export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin eval sudo $(aws ecr get-login --no-include-email --region us-west-2) latest_tag=$(aws ecr describe-images --repository-name ssoweb --region us-west-2 --output text --query \'sort_by(imageDetails,& imagePushedAt)[*].imageTags[*]\' | tr \'\\t\' \'\\n\' | tail -1) +export current_tag=$(kubectl get deployment -n dev ssoweb -o jsonpath="{..image}" | cut -d ':' -f 2) sleep 60 fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --namespace=dev --update-image=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${latest_tag} ''' script { - env.DEPLOY_STG_STATUS = "true" + env.DEPLOY_STG_STATUS = "1" } } } @@ -85,10 +86,12 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names success { sh 'env' echo "FOO is '${DEPLOY_STG_STATUS}'" + echo "FOO is '${current_tag}'" } failure { sh 'env' - echo "FOO is '${DEPLOY_STG_STATUS}'" + echo "FOO is '${DEPLOY_STG_STATUS}'" + echo "FOO is '${current_tag}'" } } triggers { From 591b4c1a33c7a303806f29d3fa329377cf96337c Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 19:47:13 +0530 Subject: [PATCH 10/16] fix pipe --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 500f8bae..3100aebd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,11 +52,13 @@ sudo docker push $AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${VERSIO branch 'testci' } steps { + script { + env.current_tag = sh(returnStdout: true, script: "kubectl get deployment -n dev ssoweb -o jsonpath=\"{..image}\" | cut -d ':' -f 2") + } sh ''' export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin eval sudo $(aws ecr get-login --no-include-email --region us-west-2) latest_tag=$(aws ecr describe-images --repository-name ssoweb --region us-west-2 --output text --query \'sort_by(imageDetails,& imagePushedAt)[*].imageTags[*]\' | tr \'\\t\' \'\\n\' | tail -1) -export current_tag=$(kubectl get deployment -n dev ssoweb -o jsonpath="{..image}" | cut -d ':' -f 2) sleep 60 fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --namespace=dev --update-image=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${latest_tag} ''' From 99a1ed750256bf6368d71cdb8efb817fe0e31e56 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 19:49:50 +0530 Subject: [PATCH 11/16] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3100aebd..f6e85e9f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,7 @@ sudo docker push $AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${VERSIO } steps { script { - env.current_tag = sh(returnStdout: true, script: "kubectl get deployment -n dev ssoweb -o jsonpath=\"{..image}\" | cut -d ':' -f 2") + env.current_tag = sh(returnStdout: true, script: "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin && kubectl get deployment -n dev ssoweb -o jsonpath=\"{..image}\" | cut -d ':' -f 2") } sh ''' export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin From 57cee9be72f0f534786f5e09d506e4d08de1184e Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 19:54:54 +0530 Subject: [PATCH 12/16] test --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6e85e9f..301f099f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -93,7 +93,11 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names failure { sh 'env' echo "FOO is '${DEPLOY_STG_STATUS}'" - echo "FOO is '${current_tag}'" + echo "FOO is '${current_tag}'" + sh ''' + fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --namespace=dev --update-image=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${current_tag} + ''' + } } triggers { From 95499154e4de1327f35217beef4dda1ad44f04e6 Mon Sep 17 00:00:00 2001 From: geethaka Date: Fri, 19 Jul 2019 19:58:27 +0530 Subject: [PATCH 13/16] fix files --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 301f099f..1c99bf20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -95,6 +95,7 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names echo "FOO is '${DEPLOY_STG_STATUS}'" echo "FOO is '${current_tag}'" sh ''' + export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --namespace=dev --update-image=$AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${current_tag} ''' From 4f0e74220d639e95bbbae208849fbd2ef642b591 Mon Sep 17 00:00:00 2001 From: Kasun Geethaka Date: Wed, 24 Jul 2019 19:58:30 +0530 Subject: [PATCH 14/16] Update Jenkinsfile --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1c99bf20..c313ebda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { } stage('ecr push') { when { - branch 'testci' + branch 'master' } steps { sh '''eval sudo $(aws ecr get-login --no-include-email --region us-west-2) @@ -49,7 +49,7 @@ sudo docker push $AWS_ACCOUNT_ID.dkr.ecr.us-west-2.amazonaws.com/ssoweb:${VERSIO } stage('deploy to stg') { when { - branch 'testci' + branch 'master' } steps { script { @@ -69,7 +69,7 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } stage('stg test execution ') { when { - branch 'testci' + branch 'master' } steps { sh './int_test.sh' @@ -77,7 +77,7 @@ fluxctl release --k8s-fwd-ns=flux --workload=dev:helmrelease/rubycas-dev --names } stage('deploy to prod') { when { - branch 'testci' + branch 'master' } steps { sh 'echo "this will deploy to next env"' From 4c0c89ba5f2ebe91d8598a58b0292f5dc09d7eeb Mon Sep 17 00:00:00 2001 From: Kasun Geethaka Date: Wed, 24 Jul 2019 19:59:39 +0530 Subject: [PATCH 15/16] Update int_test.sh --- int_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/int_test.sh b/int_test.sh index fa725efa..e09379b8 100755 --- a/int_test.sh +++ b/int_test.sh @@ -1,7 +1,7 @@ #!/bin/bash # added a sleep since kubernets deployment can take time to propogate -#sleep 60 +sleep 60 test_result=$(curl -s -o /dev/null -w "%{http_code}" http://rubycas.k8.bebraven.org1/login) From 1618aced035f08076a52c83e55e34d0863fb9317 Mon Sep 17 00:00:00 2001 From: Kasun Geethaka Date: Wed, 24 Jul 2019 20:01:56 +0530 Subject: [PATCH 16/16] Update int_test.sh --- int_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/int_test.sh b/int_test.sh index e09379b8..d287cfa4 100755 --- a/int_test.sh +++ b/int_test.sh @@ -3,7 +3,7 @@ # added a sleep since kubernets deployment can take time to propogate sleep 60 -test_result=$(curl -s -o /dev/null -w "%{http_code}" http://rubycas.k8.bebraven.org1/login) +test_result=$(curl -s -o /dev/null -w "%{http_code}" http://rubycas.k8.bebraven.org/login) echo $test_result if [ $test_result == 200 ]