@@ -219,6 +219,7 @@ pipeline {
219219 env. META_TAG = env. EXT_RELEASE_CLEAN + ' -ls' + env. LS_TAG_NUMBER
220220 env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
221221 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'
222+ env. CITEST_IMAGETAG = ' latest'
222223 }
223224 }
224225 }
@@ -244,6 +245,7 @@ pipeline {
244245 env. EXT_RELEASE_TAG = ' version-' + env. EXT_RELEASE_CLEAN
245246 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DEV_DOCKERHUB_IMAGE + ' /tags/'
246247 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'
248+ env. CITEST_IMAGETAG = ' develop'
247249 }
248250 }
249251 }
@@ -269,6 +271,7 @@ pipeline {
269271 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /pull/' + env. PULL_REQUEST
270272 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. PR_DOCKERHUB_IMAGE + ' /tags/'
271273 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'
274+ env. CITEST_IMAGETAG = ' develop'
272275 }
273276 }
274277 }
@@ -626,13 +629,16 @@ pipeline {
626629 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
627630 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
628631 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
632+
629633 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
634+ declare -A pids
630635 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
631636 for i in "${CACHE[@]}"; do
632637 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
638+ pids[$!]="$i"
633639 done
634- for p in $(jobs -p) ; do
635- wait "$p" || { echo "job $p failed" >&2; exit 1; }
640+ for p in "${!pids[@]}" ; do
641+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
636642 done
637643 fi
638644 '''
@@ -692,13 +698,16 @@ pipeline {
692698 echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
693699 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
694700 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
701+
695702 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
703+ declare -A pids
696704 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
697705 for i in "${CACHE[@]}"; do
698706 docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
707+ pids[$!]="$i"
699708 done
700- for p in $(jobs -p) ; do
701- wait "$p" || { echo "job $p failed" >&2; exit 1; }
709+ for p in "${!pids[@]}" ; do
710+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
702711 done
703712 fi
704713 '''
@@ -752,12 +761,14 @@ pipeline {
752761 echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
753762 echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
754763 if [[ "${PACKAGE_CHECK}" != "true" ]]; then
764+ declare -A pids
755765 IFS=',' read -ra CACHE <<< "$BUILDCACHE"
756766 for i in "${CACHE[@]}"; do
757767 docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
768+ pids[$!]="$i"
758769 done
759- for p in $(jobs -p) ; do
760- wait "$p" || { echo "job $p failed" >&2; exit 1; }
770+ for p in "${!pids[@]}" ; do
771+ wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
761772 done
762773 fi
763774 '''
@@ -882,7 +893,7 @@ pipeline {
882893 CI_DOCKERENV="LSIO_FIRST_PARTY=true"
883894 fi
884895 fi
885- docker pull ghcr.io/linuxserver/ci:latest
896+ docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
886897 if [ "${MULTIARCH}" == "true" ]; then
887898 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
888899 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -907,7 +918,7 @@ pipeline {
907918 -e WEB_PATH=\" ${CI_WEBPATH}\" \
908919 -e NODE_NAME=\" ${NODE_NAME}\" \
909920 -e SYFT_IMAGE_TAG=\" ${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
910- -t ghcr.io/linuxserver/ci:latest \
921+ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
911922 python3 test_build.py'''
912923 }
913924 }
@@ -933,9 +944,11 @@ pipeline {
933944 CACHEIMAGE=${i}
934945 fi
935946 done
936- 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}
947+ 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} || \
948+ { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
937949 if [ -n "${SEMVER}" ]; then
938- docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
950+ docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
951+ { [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
939952 fi
940953 done
941954 '''
@@ -960,20 +973,27 @@ pipeline {
960973 CACHEIMAGE=${i}
961974 fi
962975 done
963- 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}
964- 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}
976+ 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} || \
977+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
978+ 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} || \
979+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
965980 if [ -n "${SEMVER}" ]; then
966- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
967- docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
981+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
982+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
983+ docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
984+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
968985 fi
969986 done
970987 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
971- docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
972- docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
973-
974- docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
988+ docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
989+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
990+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
991+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
992+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
993+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
975994 if [ -n "${SEMVER}" ]; then
976- docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
995+ docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
996+ { [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]] && exit 1; }
977997 fi
978998 done
979999 '''
@@ -991,6 +1011,16 @@ pipeline {
9911011 environment name : ' EXIT_STATUS' , value : ' '
9921012 }
9931013 steps {
1014+ echo " Auto-generating release notes"
1015+ sh ''' if [ "$(git tag --points-at HEAD)" != "" ]; then
1016+ echo "Existing tag points to current commit, suggesting no new LS changes"
1017+ AUTO_RELEASE_NOTES="No changes"
1018+ else
1019+ 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 \
1020+ -d '{"tag_name":"'${META_TAG}'",\
1021+ "target_commitish": "master"}' \
1022+ | jq -r '.body' | sed 's|## What.s Changed||')
1023+ fi'''
9941024 echo " Pushing New tag for current commit ${ META_TAG} "
9951025 sh ''' curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
9961026 -d '{"tag":"'${META_TAG}'",\
@@ -1001,12 +1031,19 @@ pipeline {
10011031 echo " Pushing New release for Tag"
10021032 sh ''' #! /bin/bash
10031033 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
1004- echo '{"tag_name":"'${META_TAG}'",\
1005- "target_commitish": "master",\
1006- "name": "'${META_TAG}'",\
1007- "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
1008- printf '","draft": false,"prerelease": false}' >> releasebody.json
1009- paste -d'\\ 0' start releasebody.json > releasebody.json.done
1034+ jq -n \
1035+ --arg tag_name "$META_TAG" \
1036+ --arg target_commitish "master" \
1037+ --arg ci_url "${CI_URL:-N/A}" \
1038+ --arg ls_notes "$AUTO_RELEASE_NOTES" \
1039+ --arg remote_notes "$(cat releasebody.json)" \
1040+ '{
1041+ "tag_name": $tag_name,
1042+ "target_commitish": $target_commitish,
1043+ "name": $tag_name,
1044+ "body": ("**CI Report:**\\ n\\ n" + $ci_url + "\\ n\\ n**LinuxServer Changes:**\\ n\\ n" + $ls_notes + "\\ n\\ n**Remote Changes:**\\ n\\ n" + $remote_notes),
1045+ "draft": false,
1046+ "prerelease": false }' > releasebody.json.done
10101047 curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
10111048 }
10121049 }
0 commit comments