Skip to content

Commit 0e3dacf

Browse files
Bot Updating Templated Files
1 parent 59b4465 commit 0e3dacf

File tree

1 file changed

+73
-35
lines changed

1 file changed

+73
-35
lines changed

Jenkinsfile

Lines changed: 73 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ pipeline {
206206
env.META_TAG = '3.19-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207207
env.EXT_RELEASE_TAG = '3.19-version-' + env.EXT_RELEASE_CLEAN
208208
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'
209+
env.CITEST_IMAGETAG = 'latest'
209210
}
210211
}
211212
}
@@ -231,6 +232,7 @@ pipeline {
231232
env.EXT_RELEASE_TAG = '3.19-version-' + env.EXT_RELEASE_CLEAN
232233
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
233234
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'
235+
env.CITEST_IMAGETAG = 'develop'
234236
}
235237
}
236238
}
@@ -256,6 +258,7 @@ pipeline {
256258
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
257259
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
258260
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'
261+
env.CITEST_IMAGETAG = 'develop'
259262
}
260263
}
261264
}
@@ -278,7 +281,7 @@ pipeline {
278281
-v ${WORKSPACE}:/mnt \
279282
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
280283
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
281-
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
284+
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
282285
apk add --no-cache python3 && \
283286
python3 -m venv /lsiopy && \
284287
pip install --no-cache-dir -U pip && \
@@ -549,13 +552,16 @@ pipeline {
549552
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
550553
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
551554
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
555+
552556
if [[ "${PACKAGE_CHECK}" != "true" ]]; then
557+
declare -A pids
553558
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
554559
for i in "${CACHE[@]}"; do
555560
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
561+
pids[$!]="$i"
556562
done
557-
for p in $(jobs -p); do
558-
wait "$p" || { echo "job $p failed" >&2; exit 1; }
563+
for p in "${!pids[@]}"; do
564+
wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
559565
done
560566
fi
561567
'''
@@ -614,13 +620,16 @@ pipeline {
614620
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
615621
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
616622
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
623+
617624
if [[ "${PACKAGE_CHECK}" != "true" ]]; then
625+
declare -A pids
618626
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
619627
for i in "${CACHE[@]}"; do
620628
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
629+
pids[$!]="$i"
621630
done
622-
for p in $(jobs -p); do
623-
wait "$p" || { echo "job $p failed" >&2; exit 1; }
631+
for p in "${!pids[@]}"; do
632+
wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
624633
done
625634
fi
626635
'''
@@ -673,12 +682,14 @@ pipeline {
673682
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
674683
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
675684
if [[ "${PACKAGE_CHECK}" != "true" ]]; then
685+
declare -A pids
676686
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
677687
for i in "${CACHE[@]}"; do
678688
docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
689+
pids[$!]="$i"
679690
done
680-
for p in $(jobs -p); do
681-
wait "$p" || { echo "job $p failed" >&2; exit 1; }
691+
for p in "${!pids[@]}"; do
692+
wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
682693
done
683694
fi
684695
'''
@@ -803,7 +814,7 @@ pipeline {
803814
CI_DOCKERENV="LSIO_FIRST_PARTY=true"
804815
fi
805816
fi
806-
docker pull ghcr.io/linuxserver/ci:latest
817+
docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
807818
if [ "${MULTIARCH}" == "true" ]; then
808819
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
809820
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -827,7 +838,7 @@ pipeline {
827838
-e WEB_PATH=\"${CI_WEBPATH}\" \
828839
-e NODE_NAME=\"${NODE_NAME}\" \
829840
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
830-
-t ghcr.io/linuxserver/ci:latest \
841+
-t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
831842
python3 test_build.py'''
832843
}
833844
}
@@ -853,9 +864,11 @@ pipeline {
853864
CACHEIMAGE=${i}
854865
fi
855866
done
856-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:3.19 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
867+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:3.19 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
868+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
857869
if [ -n "${SEMVER}" ]; then
858-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
870+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
871+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
859872
fi
860873
done
861874
'''
@@ -880,20 +893,27 @@ pipeline {
880893
CACHEIMAGE=${i}
881894
fi
882895
done
883-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-3.19 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
884-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-3.19 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
896+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-3.19 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
897+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
898+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-3.19 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
899+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
885900
if [ -n "${SEMVER}" ]; then
886-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
887-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
901+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
902+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
903+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
904+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
888905
fi
889906
done
890907
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
891-
docker buildx imagetools create -t ${MANIFESTIMAGE}:3.19 ${MANIFESTIMAGE}:amd64-3.19 ${MANIFESTIMAGE}:arm64v8-3.19
892-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
893-
894-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
908+
docker buildx imagetools create -t ${MANIFESTIMAGE}:3.19 ${MANIFESTIMAGE}:amd64-3.19 ${MANIFESTIMAGE}:arm64v8-3.19 || \
909+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
910+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
911+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
912+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
913+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
895914
if [ -n "${SEMVER}" ]; then
896-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
915+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
916+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
897917
fi
898918
done
899919
'''
@@ -911,23 +931,41 @@ pipeline {
911931
environment name: 'EXIT_STATUS', value: ''
912932
}
913933
steps {
914-
echo "Pushing New tag for current commit ${META_TAG}"
915-
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
916-
-d '{"tag":"'${META_TAG}'",\
917-
"object": "'${COMMIT_SHA}'",\
918-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to 3.19",\
919-
"type": "commit",\
920-
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}' '''
921-
echo "Pushing New release for Tag"
922934
sh '''#! /bin/bash
935+
echo "Auto-generating release notes"
936+
if [ "$(git tag --points-at HEAD)" != "" ]; then
937+
echo "Existing tag points to current commit, suggesting no new LS changes"
938+
AUTO_RELEASE_NOTES="No changes"
939+
else
940+
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 \
941+
-d '{"tag_name":"'${META_TAG}'",\
942+
"target_commitish": "3.19"}' \
943+
| jq -r '.body' | sed 's|## What.s Changed||')
944+
fi
945+
echo "Pushing New tag for current commit ${META_TAG}"
946+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
947+
-d '{"tag":"'${META_TAG}'",\
948+
"object": "'${COMMIT_SHA}'",\
949+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to 3.19",\
950+
"type": "commit",\
951+
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}'
952+
echo "Pushing New release for Tag"
923953
echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
924-
echo '{"tag_name":"'${META_TAG}'",\
925-
"target_commitish": "3.19",\
926-
"name": "'${META_TAG}'",\
927-
"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
928-
printf '","draft": false,"prerelease": true}' >> releasebody.json
929-
paste -d'\\0' start releasebody.json > releasebody.json.done
930-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
954+
jq -n \
955+
--arg tag_name "$META_TAG" \
956+
--arg target_commitish "3.19" \
957+
--arg ci_url "${CI_URL:-N/A}" \
958+
--arg ls_notes "$AUTO_RELEASE_NOTES" \
959+
--arg remote_notes "$(cat releasebody.json)" \
960+
'{
961+
"tag_name": $tag_name,
962+
"target_commitish": $target_commitish,
963+
"name": $tag_name,
964+
"body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
965+
"draft": false,
966+
"prerelease": true }' > releasebody.json.done
967+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
968+
'''
931969
}
932970
}
933971
// Add protection to the release branch

0 commit comments

Comments
 (0)