@@ -200,6 +200,7 @@ pipeline {
200200 env. META_TAG = env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
201201 env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
202202 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'
203+ env. CITEST_IMAGETAG = ' latest'
203204 }
204205 }
205206 }
@@ -225,6 +226,7 @@ pipeline {
225226 env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
226227 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DEV_DOCKERHUB_IMAGE + ' /tags/'
227228 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'
229+ env. CITEST_IMAGETAG = ' develop'
228230 }
229231 }
230232 }
@@ -250,6 +252,7 @@ pipeline {
250252 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /pull/' + env. PULL_REQUEST
251253 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. PR_DOCKERHUB_IMAGE + ' /tags/'
252254 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'
255+ env. CITEST_IMAGETAG = ' develop'
253256 }
254257 }
255258 }
@@ -272,7 +275,7 @@ pipeline {
272275 -v ${WORKSPACE}:/mnt \
273276 -e AWS_ACCESS_KEY_ID=\" ${S3_KEY}\" \
274277 -e AWS_SECRET_ACCESS_KEY=\" ${S3_SECRET}\" \
275- ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
278+ ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
276279 apk add --no-cache python3 && \
277280 python3 -m venv /lsiopy && \
278281 pip install --no-cache-dir -U pip && \
@@ -544,13 +547,16 @@ pipeline {
544547 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
545548 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
546549 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
550+
547551 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
552+ declare -A pids
548553 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
549554 for i in "${CACHE[@]}"; do
550555 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
556+ pids[$!]="$i"
551557 done
552- for p in $(jobs -p) ; do
553- wait "$p" || { echo "job $p failed" >&2; exit 1; }
558+ for p in "${!pids[@]}" ; do
559+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
554560 done
555561 fi
556562 '''
@@ -610,13 +616,16 @@ pipeline {
610616 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
611617 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
612618 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
619+
613620 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
621+ declare -A pids
614622 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
615623 for i in "${CACHE[@]}"; do
616624 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
625+ pids[$!]="$i"
617626 done
618- for p in $(jobs -p) ; do
619- wait "$p" || { echo "job $p failed" >&2; exit 1; }
627+ for p in "${!pids[@]}" ; do
628+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
620629 done
621630 fi
622631 '''
@@ -670,12 +679,14 @@ pipeline {
670679 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
671680 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
672681 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
682+ declare -A pids
673683 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
674684 for i in "${CACHE[@]}"; do
675685 docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
686+ pids[$!]="$i"
676687 done
677- for p in $(jobs -p) ; do
678- wait "$p" || { echo "job $p failed" >&2; exit 1; }
688+ for p in "${!pids[@]}" ; do
689+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
679690 done
680691 fi
681692 '''
@@ -800,7 +811,7 @@ pipeline {
800811 CI_DOCKERENV="LSIO_FIRST_PARTY=true"
801812 fi
802813 fi
803- docker pull ghcr.io/linuxserver/ci:latest
814+ docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
804815 if [ "${MULTIARCH}" == "true" ]; then
805816 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
806817 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -823,7 +834,7 @@ pipeline {
823834 -e WEB_PATH=\" ${CI_WEBPATH}\" \
824835 -e NODE_NAME=\" ${NODE_NAME}\" \
825836 -e SYFT_IMAGE_TAG=\" ${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
826- -t ghcr.io/linuxserver/ci:latest \
837+ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
827838 python3 test_build.py'''
828839 }
829840 }
@@ -849,9 +860,11 @@ pipeline {
849860 CACHEIMAGE=${i}
850861 fi
851862 done
852- docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
863+ docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
864+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
853865 if [ -n "${SEMVER}" ]; then
854- docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
866+ docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
867+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
855868 fi
856869 done
857870 '''
@@ -876,20 +889,27 @@ pipeline {
876889 CACHEIMAGE=${i}
877890 fi
878891 done
879- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
880- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
892+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
893+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
894+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
895+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
881896 if [ -n "${SEMVER}" ]; then
882- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
883- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
897+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
898+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
899+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
900+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
884901 fi
885902 done
886903 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
887- docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
888- docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
889-
890- docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
904+ docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
905+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
906+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
907+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
908+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
909+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
891910 if [ -n "${SEMVER}" ]; then
892- docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
911+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
912+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
893913 fi
894914 done
895915 '''
@@ -907,23 +927,41 @@ pipeline {
907927 environment name : ' EXIT_STATUS' , value : ' '
908928 }
909929 steps {
910- echo " Pushing New tag for current commit ${ META_TAG} "
911- sh ''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
912- -d '{"tag":"'${META_TAG}'",\
913- "object": "'${COMMIT_SHA}'",\
914- "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
915- "type": "commit",\
916- "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' ''' 917- echo " Pushing New release for Tag"
918930 sh ''' #! /bin/bash
931+ echo "Auto-generating release notes"
932+ if [ "$(git tag --points-at HEAD)" != "" ]; then
933+ echo "Existing tag points to current commit, suggesting no new LS changes"
934+ AUTO_RELEASE_NOTES="No changes"
935+ else
936+ AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \
937+ -d '{"tag_name":"'${META_TAG}'",\
938+ "target_commitish": "main"}' \
939+ | jq -r '.body' | sed 's|## What.s Changed||')
940+ fi
941+ echo "Pushing New tag for current commit ${META_TAG}"
942+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
943+ -d '{"tag":"'${META_TAG}'",\
944+ "object": "'${COMMIT_SHA}'",\
945+ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
946+ "type": "commit",\
947+ "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' 948+ echo "Pushing New release for Tag"
919949 echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
920- echo '{"tag_name":"'${META_TAG}'",\
921- "target_commitish": "main",\
922- "name": "'${META_TAG}'",\
923- "body": "**CI Report:**\\ n\\ n'${CI_URL:-N/A}'\\ n\\ n**LinuxServer Changes:**\\ n\\ n'${LS_RELEASE_NOTES}'\\ n\\ n**Remote Changes:**\\ n\\ n' > start
924- printf '","draft": false,"prerelease": false}' >> releasebody.json
925- paste -d'\\ 0' start releasebody.json > releasebody.json.done
926- curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
950+ jq -n \
951+ --arg tag_name "$META_TAG" \
952+ --arg target_commitish "main" \
953+ --arg ci_url "${CI_URL:-N/A}" \
954+ --arg ls_notes "$AUTO_RELEASE_NOTES" \
955+ --arg remote_notes "$(cat releasebody.json)" \
956+ '{
957+ "tag_name": $tag_name,
958+ "target_commitish": $target_commitish,
959+ "name": $tag_name,
960+ "body": ("**CI Report:**\\ n\\ n" + $ci_url + "\\ n\\ n**LinuxServer Changes:**\\ n\\ n" + $ls_notes + "\\ n\\ n**Remote Changes:**\\ n\\ n" + $remote_notes),
961+ "draft": false,
962+ "prerelease": false }' > releasebody.json.done
963+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
964+ '''
927965 }
928966 }
929967 // Add protection to the release branch
0 commit comments