@@ -218,6 +218,7 @@ pipeline {
218218 env. META_TAG = env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
219219 env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
220220 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'
221+ env. CITEST_IMAGETAG = ' latest'
221222 }
222223 }
223224 }
@@ -243,6 +244,7 @@ pipeline {
243244 env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
244245 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DEV_DOCKERHUB_IMAGE + ' /tags/'
245246 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'
247+ env. CITEST_IMAGETAG = ' develop'
246248 }
247249 }
248250 }
@@ -268,6 +270,7 @@ pipeline {
268270 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /pull/' + env. PULL_REQUEST
269271 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. PR_DOCKERHUB_IMAGE + ' /tags/'
270272 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'
273+ env. CITEST_IMAGETAG = ' develop'
271274 }
272275 }
273276 }
@@ -290,7 +293,7 @@ pipeline {
290293 -v ${WORKSPACE}:/mnt \
291294 -e AWS_ACCESS_KEY_ID=\" ${S3_KEY}\" \
292295 -e AWS_SECRET_ACCESS_KEY=\" ${S3_SECRET}\" \
293- ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
296+ ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
294297 apk add --no-cache python3 && \
295298 python3 -m venv /lsiopy && \
296299 pip install --no-cache-dir -U pip && \
@@ -562,13 +565,16 @@ pipeline {
562565 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
563566 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
564567 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
568+
565569 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
570+ declare -A pids
566571 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
567572 for i in "${CACHE[@]}"; do
568573 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
574+ pids[$!]="$i"
569575 done
570- for p in $(jobs -p) ; do
571- wait "$p" || { echo "job $p failed" >&2; exit 1; }
576+ for p in "${!pids[@]}" ; do
577+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
572578 done
573579 fi
574580 '''
@@ -628,13 +634,16 @@ pipeline {
628634 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
629635 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
630636 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
637+
631638 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
639+ declare -A pids
632640 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
633641 for i in "${CACHE[@]}"; do
634642 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
643+ pids[$!]="$i"
635644 done
636- for p in $(jobs -p) ; do
637- wait "$p" || { echo "job $p failed" >&2; exit 1; }
645+ for p in "${!pids[@]}" ; do
646+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
638647 done
639648 fi
640649 '''
@@ -688,12 +697,14 @@ pipeline {
688697 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
689698 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
690699 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
700+ declare -A pids
691701 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
692702 for i in "${CACHE[@]}"; do
693703 docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
704+ pids[$!]="$i"
694705 done
695- for p in $(jobs -p) ; do
696- wait "$p" || { echo "job $p failed" >&2; exit 1; }
706+ for p in "${!pids[@]}" ; do
707+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
697708 done
698709 fi
699710 '''
@@ -818,7 +829,7 @@ pipeline {
818829 CI_DOCKERENV="LSIO_FIRST_PARTY=true"
819830 fi
820831 fi
821- docker pull ghcr.io/linuxserver/ci:latest
832+ docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
822833 if [ "${MULTIARCH}" == "true" ]; then
823834 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
824835 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -842,7 +853,7 @@ pipeline {
842853 -e WEB_PATH=\" ${CI_WEBPATH}\" \
843854 -e NODE_NAME=\" ${NODE_NAME}\" \
844855 -e SYFT_IMAGE_TAG=\" ${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
845- -t ghcr.io/linuxserver/ci:latest \
856+ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
846857 python3 test_build.py'''
847858 }
848859 }
@@ -868,9 +879,11 @@ pipeline {
868879 CACHEIMAGE=${i}
869880 fi
870881 done
871- 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}
882+ 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} || \
883+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
872884 if [ -n "${SEMVER}" ]; then
873- docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
885+ docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
886+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
874887 fi
875888 done
876889 '''
@@ -895,20 +908,27 @@ pipeline {
895908 CACHEIMAGE=${i}
896909 fi
897910 done
898- 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}
899- 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}
911+ 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} || \
912+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
913+ 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} || \
914+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
900915 if [ -n "${SEMVER}" ]; then
901- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
902- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
916+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
917+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
918+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
919+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
903920 fi
904921 done
905922 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
906- docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
907- docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
908-
909- docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
923+ docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
924+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
925+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
926+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
927+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
928+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
910929 if [ -n "${SEMVER}" ]; then
911- docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
930+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
931+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
912932 fi
913933 done
914934 '''
@@ -926,23 +946,41 @@ pipeline {
926946 environment name : ' EXIT_STATUS' , value : ' '
927947 }
928948 steps {
929- echo " Pushing New tag for current commit ${ META_TAG} "
930- sh ''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
931- -d '{"tag":"'${META_TAG}'",\
932- "object": "'${COMMIT_SHA}'",\
933- "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
934- "type": "commit",\
935- "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
936- echo " Pushing New release for Tag"
937949 sh ''' #! /bin/bash
950+ echo "Auto-generating release notes"
951+ if [ "$(git tag --points-at HEAD)" != "" ]; then
952+ echo "Existing tag points to current commit, suggesting no new LS changes"
953+ AUTO_RELEASE_NOTES="No changes"
954+ else
955+ 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 \
956+ -d '{"tag_name":"'${META_TAG}'",\
957+ "target_commitish": "main"}' \
958+ | jq -r '.body' | sed 's|## What.s Changed||')
959+ fi
960+ echo "Pushing New tag for current commit ${META_TAG}"
961+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
962+ -d '{"tag":"'${META_TAG}'",\
963+ "object": "'${COMMIT_SHA}'",\
964+ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
965+ "type": "commit",\
966+ "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
967+ echo "Pushing New release for Tag"
938968 curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\ (.*\\ ).$:\\ 1:' > releasebody.json
939- echo '{"tag_name":"'${META_TAG}'",\
940- "target_commitish": "main",\
941- "name": "'${META_TAG}'",\
942- "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
943- printf '","draft": false,"prerelease": false}' >> releasebody.json
944- paste -d'\\ 0' start releasebody.json > releasebody.json.done
945- curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
969+ jq -n \
970+ --arg tag_name "$META_TAG" \
971+ --arg target_commitish "main" \
972+ --arg ci_url "${CI_URL:-N/A}" \
973+ --arg ls_notes "$AUTO_RELEASE_NOTES" \
974+ --arg remote_notes "$(cat releasebody.json)" \
975+ '{
976+ "tag_name": $tag_name,
977+ "target_commitish": $target_commitish,
978+ "name": $tag_name,
979+ "body": ("**CI Report:**\\ n\\ n" + $ci_url + "\\ n\\ n**LinuxServer Changes:**\\ n\\ n" + $ls_notes + "\\ n\\ n**Remote Changes:**\\ n\\ n" + $remote_notes),
980+ "draft": false,
981+ "prerelease": false }' > releasebody.json.done
982+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
983+ '''
946984 }
947985 }
948986 // Add protection to the release branch
0 commit comments