File tree Expand file tree Collapse file tree
ansible/roles/repository/templates Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -879,6 +879,9 @@ pipeline {
879879 environment name : ' EXIT_STATUS' , value : ' '
880880 }
881881 steps {
882+ script{
883+ env. PUSH_ATTEMPTED = ' true'
884+ }
882885 retry_backoff(5 ,5 ) {
883886 sh ''' #! /bin/bash
884887 set -e
@@ -908,11 +911,18 @@ pipeline {
908911 environment name : ' EXIT_STATUS' , value : ' '
909912 }
910913 steps {
914+ script{
915+ env. PUSH_ATTEMPTED = ' true'
916+ }
911917 retry_backoff(5 ,5 ) {
912918 sh ''' #! /bin/bash
913919 set -e
914920 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
915- [[ ${MANIFESTIMAGE%%/*} =~ \\ . ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
921+ if [[ "${MANIFESTIMAGE%%/*}" =~ \\ . ]]; then
922+ MANIFESTIMAGEPLUS="${MANIFESTIMAGE}"
923+ else
924+ MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
925+ fi
916926 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
917927 for i in "${CACHE[@]}"; do
918928 if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
@@ -1080,7 +1090,7 @@ EOF
10801090 }
10811091 script {
10821092 if (env. GITHUBIMAGE =~ / lspipepr/ ){
1083- if (env. CI_TEST_ATTEMPTED == " true" ){
1093+ if (env. CI_TEST_ATTEMPTED == " true" || env . PUSH_ATTEMPTED == " true " ){
10841094 sh ''' #! /bin/bash
10851095 # Function to retrieve JSON data from URL
10861096 get_json() {
Original file line number Diff line number Diff line change @@ -1248,6 +1248,9 @@ pipeline {
12481248 environment name: 'EXIT_STATUS', value: ''
12491249 }
12501250 steps {
1251+ script{
1252+ env.PUSH_ATTEMPTED = 'true'
1253+ }
12511254 retry_backoff(5,5) {
12521255 sh '''#! /bin/bash
12531256 set -e
@@ -1280,11 +1283,18 @@ pipeline {
12801283 environment name: 'EXIT_STATUS', value: ''
12811284 }
12821285 steps {
1286+ script{
1287+ env.PUSH_ATTEMPTED = 'true'
1288+ }
12831289 retry_backoff(5,5) {
12841290 sh '''#! /bin/bash
12851291 set -e
12861292 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
1287- [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
1293+ if [[ "${MANIFESTIMAGE%%/*}" =~ \\. ]]; then
1294+ MANIFESTIMAGEPLUS="${MANIFESTIMAGE}"
1295+ else
1296+ MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
1297+ fi
12881298 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
12891299 for i in "${CACHE[@]}"; do
12901300 if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
@@ -1512,7 +1522,7 @@ EOF
15121522 }
15131523 script {
15141524 if (env.GITHUBIMAGE =~ /lspipepr/){
1515- if (env.CI_TEST_ATTEMPTED == "true"){
1525+ if (env.CI_TEST_ATTEMPTED == "true" || env.PUSH_ATTEMPTED == "true" ){
15161526 sh '''#! /bin/bash
15171527 # Function to retrieve JSON data from URL
15181528 get_json() {
You can’t perform that action at this time.
0 commit comments