Skip to content

Commit 1b3084c

Browse files
committed
try something different
1 parent 4e0d210 commit 1b3084c

2 files changed

Lines changed: 6 additions & 10 deletions

File tree

Jenkinsfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pipeline {
7575
'''
7676
script{
7777
env.EXIT_STATUS = ''
78-
env.CI_TEST_COMPLETED = ''
78+
env.CI_TEST_ATTEMPTED = ''
7979
env.LS_RELEASE = sh(
8080
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
8181
returnStdout: true).trim()
@@ -826,6 +826,7 @@ pipeline {
826826
script{
827827
env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
828828
env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
829+
CI_TEST_ATTEMPTED = 'true'
829830
}
830831
sh '''#! /bin/bash
831832
set -e
@@ -865,9 +866,6 @@ pipeline {
865866
-e BUILD_NUMBER=\"${BUILD_NUMBER}\" \
866867
-t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
867868
python3 test_build.py'''
868-
script{
869-
env.CI_TEST_COMPLETED = 'true'
870-
}
871869
}
872870
}
873871
}
@@ -1035,7 +1033,7 @@ EOF
10351033
stage('Pull Request Comment') {
10361034
when {
10371035
not {environment name: 'CHANGE_ID', value: ''}
1038-
environment name: 'CI_TEST_COMPLETED', value: 'true'
1036+
environment name: 'CI_TEST_ATTEMPTED', value: 'true'
10391037
}
10401038
steps {
10411039
sh '''#! /bin/bash

ansible/roles/repository/templates/Jenkinsfile.j2

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pipeline {
6161
'''
6262
script{
6363
env.EXIT_STATUS = ''
64-
env.CI_TEST_COMPLETED = ''
64+
env.CI_TEST_ATTEMPTED = ''
6565
env.LS_RELEASE = sh(
6666
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:{{ release_tag }} 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
6767
returnStdout: true).trim()
@@ -1178,6 +1178,7 @@ pipeline {
11781178
script{
11791179
env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
11801180
env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
1181+
CI_TEST_ATTEMPTED = 'true'
11811182
}
11821183
sh '''#! /bin/bash
11831184
set -e
@@ -1234,9 +1235,6 @@ pipeline {
12341235
-e BUILD_NUMBER=\"${BUILD_NUMBER}\" \
12351236
-t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
12361237
python3 test_build.py'''
1237-
script{
1238-
env.CI_TEST_COMPLETED = 'true'
1239-
}
12401238
}
12411239
}
12421240
}
@@ -1445,7 +1443,7 @@ EOF
14451443
stage('Pull Request Comment') {
14461444
when {
14471445
not {environment name: 'CHANGE_ID', value: ''}
1448-
environment name: 'CI_TEST_COMPLETED', value: 'true'
1446+
environment name: 'CI_TEST_ATTEMPTED', value: 'true'
14491447
}
14501448
steps {
14511449
sh '''#! /bin/bash

0 commit comments

Comments
 (0)