@@ -216,6 +216,7 @@ pipeline {
216216 env. META_TAG = ' gpu-legacy-' + env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
217217 env. EXT_RELEASE_TAG = ' gpu-legacy-version-' + env. EXT_RELEASE_CLEAN
218218 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'
219+ env. CITEST_IMAGETAG = ' latest'
219220 }
220221 }
221222 }
@@ -241,6 +242,7 @@ pipeline {
241242 env. EXT_RELEASE_TAG = ' gpu-legacy-version-' + env. EXT_RELEASE_CLEAN
242243 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DEV_DOCKERHUB_IMAGE + ' /tags/'
243244 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'
245+ env. CITEST_IMAGETAG = ' develop'
244246 }
245247 }
246248 }
@@ -266,6 +268,7 @@ pipeline {
266268 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /pull/' + env. PULL_REQUEST
267269 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. PR_DOCKERHUB_IMAGE + ' /tags/'
268270 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'
271+ env. CITEST_IMAGETAG = ' develop'
269272 }
270273 }
271274 }
@@ -288,7 +291,7 @@ pipeline {
288291 -v ${WORKSPACE}:/mnt \
289292 -e AWS_ACCESS_KEY_ID=\" ${S3_KEY}\" \
290293 -e AWS_SECRET_ACCESS_KEY=\" ${S3_SECRET}\" \
291- ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
294+ ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
292295 apk add --no-cache python3 && \
293296 python3 -m venv /lsiopy && \
294297 pip install --no-cache-dir -U pip && \
@@ -623,13 +626,16 @@ pipeline {
623626 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
624627 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
625628 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
629+
626630 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
631+ declare -A pids
627632 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
628633 for i in "${CACHE[@]}"; do
629634 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
635+ pids[$!]="$i"
630636 done
631- for p in $(jobs -p) ; do
632- wait "$p" || { echo "job $p failed" >&2; exit 1; }
637+ for p in "${!pids[@]}" ; do
638+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
633639 done
634640 fi
635641 '''
@@ -689,13 +695,16 @@ pipeline {
689695 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
690696 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
691697 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
698+
692699 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
700+ declare -A pids
693701 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
694702 for i in "${CACHE[@]}"; do
695703 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
704+ pids[$!]="$i"
696705 done
697- for p in $(jobs -p) ; do
698- wait "$p" || { echo "job $p failed" >&2; exit 1; }
706+ for p in "${!pids[@]}" ; do
707+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
699708 done
700709 fi
701710 '''
@@ -749,12 +758,14 @@ pipeline {
749758 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
750759 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
751760 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
761+ declare -A pids
752762 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
753763 for i in "${CACHE[@]}"; do
754764 docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
765+ pids[$!]="$i"
755766 done
756- for p in $(jobs -p) ; do
757- wait "$p" || { echo "job $p failed" >&2; exit 1; }
767+ for p in "${!pids[@]}" ; do
768+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
758769 done
759770 fi
760771 '''
@@ -879,7 +890,7 @@ pipeline {
879890 CI_DOCKERENV="LSIO_FIRST_PARTY=true"
880891 fi
881892 fi
882- docker pull ghcr.io/linuxserver/ci:latest
893+ docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
883894 if [ "${MULTIARCH}" == "true" ]; then
884895 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
885896 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -903,7 +914,7 @@ pipeline {
903914 -e WEB_PATH=\" ${CI_WEBPATH}\" \
904915 -e NODE_NAME=\" ${NODE_NAME}\" \
905916 -e SYFT_IMAGE_TAG=\" ${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
906- -t ghcr.io/linuxserver/ci:latest \
917+ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
907918 python3 test_build.py'''
908919 }
909920 }
@@ -929,9 +940,11 @@ pipeline {
929940 CACHEIMAGE=${i}
930941 fi
931942 done
932- docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:gpu-legacy -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
943+ docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:gpu-legacy -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
944+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
933945 if [ -n "${SEMVER}" ]; then
934- docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
946+ docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
947+ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
935948 fi
936949 done
937950 '''
@@ -956,20 +969,27 @@ pipeline {
956969 CACHEIMAGE=${i}
957970 fi
958971 done
959- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-gpu-legacy -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
960- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-gpu-legacy -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
972+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-gpu-legacy -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
973+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
974+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-gpu-legacy -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
975+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
961976 if [ -n "${SEMVER}" ]; then
962- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
963- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
977+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
978+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
979+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
980+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
964981 fi
965982 done
966983 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
967- docker buildx imagetools create -t ${MANIFESTIMAGE}:gpu-legacy ${MANIFESTIMAGE}:amd64-gpu-legacy ${MANIFESTIMAGE}:arm64v8-gpu-legacy
968- docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
969-
970- docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
984+ docker buildx imagetools create -t ${MANIFESTIMAGE}:gpu-legacy ${MANIFESTIMAGE}:amd64-gpu-legacy ${MANIFESTIMAGE}:arm64v8-gpu-legacy || \
985+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
986+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
987+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
988+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
989+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
971990 if [ -n "${SEMVER}" ]; then
972- docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
991+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
992+ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
973993 fi
974994 done
975995 '''
@@ -987,23 +1007,41 @@ pipeline {
9871007 environment name : ' EXIT_STATUS' , value : ' '
9881008 }
9891009 steps {
990- echo " Pushing New tag for current commit ${ META_TAG} "
991- sh ''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
992- -d '{"tag":"'${META_TAG}'",\
993- "object": "'${COMMIT_SHA}'",\
994- "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to gpu-legacy",\
995- "type": "commit",\
996- "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' ''' 997- echo " Pushing New release for Tag"
9981010 sh ''' #! /bin/bash
999- 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
1000- echo '{"tag_name":"'${META_TAG}'",\
1001- "target_commitish": "gpu-legacy",\
1002- "name": "'${META_TAG}'",\
1003- "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
1004- printf '","draft": false,"prerelease": true}' >> releasebody.json
1005- paste -d'\\ 0' start releasebody.json > releasebody.json.done
1006- curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
1011+ echo "Auto-generating release notes"
1012+ if [ "$(git tag --points-at HEAD)" != "" ]; then
1013+ echo "Existing tag points to current commit, suggesting no new LS changes"
1014+ AUTO_RELEASE_NOTES="No changes"
1015+ else
1016+ 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 \
1017+ -d '{"tag_name":"'${META_TAG}'",\
1018+ "target_commitish": "gpu-legacy"}' \
1019+ | jq -r '.body' | sed 's|## What.s Changed||')
1020+ fi
1021+ echo "Pushing New tag for current commit ${META_TAG}"
1022+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1023+ -d '{"tag":"'${META_TAG}'",\
1024+ "object": "'${COMMIT_SHA}'",\
1025+ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to gpu-legacy",\
1026+ "type": "commit",\
1027+ "tagger": {"name": "LinuxServer-CI","email": "[email protected] ","date": "'${GITHUB_DATE}'"}}' 1028+ echo "Pushing New release for Tag"
1029+ curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json
1030+ jq -n \
1031+ --arg tag_name "$META_TAG" \
1032+ --arg target_commitish "gpu-legacy" \
1033+ --arg ci_url "${CI_URL:-N/A}" \
1034+ --arg ls_notes "$AUTO_RELEASE_NOTES" \
1035+ --arg remote_notes "$(cat releasebody.json)" \
1036+ '{
1037+ "tag_name": $tag_name,
1038+ "target_commitish": $target_commitish,
1039+ "name": $tag_name,
1040+ "body": ("**CI Report:**\\ n\\ n" + $ci_url + "\\ n\\ n**LinuxServer Changes:**\\ n\\ n" + $ls_notes + "\\ n\\ n**Remote Changes:**\\ n\\ n" + $remote_notes),
1041+ "draft": false,
1042+ "prerelease": true }' > releasebody.json.done
1043+ curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
1044+ '''
10071045 }
10081046 }
10091047 // Add protection to the release branch
0 commit comments