Skip to content

Commit c07499f

Browse files
committed
Use develop CI image when testing dev/pr builds
1 parent 5d707c5 commit c07499f

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ansible/roles/repository/templates/Jenkinsfile.j2

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ pipeline {
364364
env.META_TAG = {% if release_tag != "latest" %}'{{ release_tag }}-' + {% endif %}env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
365365
env.EXT_RELEASE_TAG = '{% if release_tag != "latest" %}{{ release_tag }}-{% endif %}version-' + env.EXT_RELEASE_CLEAN
366366
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
367+
env.CITEST_IMAGETAG = 'latest'
367368
}
368369
}
369370
}
@@ -389,6 +390,7 @@ pipeline {
389390
env.EXT_RELEASE_TAG = '{% if release_tag != "latest" %}{{ release_tag }}-{% endif %}version-' + env.EXT_RELEASE_CLEAN
390391
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
391392
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
393+
env.CITEST_IMAGETAG = 'develop'
392394
}
393395
}
394396
}
@@ -414,6 +416,7 @@ pipeline {
414416
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
415417
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
416418
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
419+
env.CITEST_IMAGETAG = 'develop'
417420
}
418421
}
419422
}
@@ -1174,7 +1177,7 @@ pipeline {
11741177
CI_DOCKERENV="LSIO_FIRST_PARTY=true"
11751178
fi
11761179
fi
1177-
docker pull ghcr.io/linuxserver/ci:latest
1180+
docker pull ghcr.io/linuxserver/ci:"${CITEST_IMAGETAG}"
11781181
if [ "${MULTIARCH}" == "true" ]; then
11791182
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
11801183
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -1215,7 +1218,7 @@ pipeline {
12151218
-e WEB_PATH=\"${CI_WEBPATH}\" \
12161219
-e NODE_NAME=\"${NODE_NAME}\" \
12171220
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
1218-
-t ghcr.io/linuxserver/ci:latest \
1221+
-t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
12191222
python3 test_build.py'''
12201223
}
12211224
}

0 commit comments

Comments
 (0)