Skip to content

Commit fdd9159

Browse files
Bot Updating Templated Files
1 parent 71dd3ea commit fdd9159

File tree

1 file changed

+82
-39
lines changed

1 file changed

+82
-39
lines changed

Jenkinsfile

Lines changed: 82 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ pipeline {
206206
env.META_TAG = '3.22-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207207
env.EXT_RELEASE_TAG = '3.22-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.22-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
'''
@@ -738,13 +749,16 @@ pipeline {
738749
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
739750
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
740751
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
752+
741753
if [[ "${PACKAGE_CHECK}" != "true" ]]; then
754+
declare -A pids
742755
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
743756
for i in "${CACHE[@]}"; do
744757
docker push ${i}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} &
758+
pids[$!]="$i"
745759
done
746-
for p in $(jobs -p); do
747-
wait "$p" || { echo "job $p failed" >&2; exit 1; }
760+
for p in "${!pids[@]}"; do
761+
wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
748762
done
749763
fi
750764
'''
@@ -869,7 +883,7 @@ pipeline {
869883
CI_DOCKERENV="LSIO_FIRST_PARTY=true"
870884
fi
871885
fi
872-
docker pull ghcr.io/linuxserver/ci:latest
886+
docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
873887
if [ "${MULTIARCH}" == "true" ]; then
874888
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
875889
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -895,7 +909,7 @@ pipeline {
895909
-e WEB_PATH=\"${CI_WEBPATH}\" \
896910
-e NODE_NAME=\"${NODE_NAME}\" \
897911
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
898-
-t ghcr.io/linuxserver/ci:latest \
912+
-t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
899913
python3 test_build.py'''
900914
}
901915
}
@@ -921,9 +935,11 @@ pipeline {
921935
CACHEIMAGE=${i}
922936
fi
923937
done
924-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:3.22 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
938+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:3.22 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
939+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
925940
if [ -n "${SEMVER}" ]; then
926-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
941+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
942+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
927943
fi
928944
done
929945
'''
@@ -948,22 +964,31 @@ pipeline {
948964
CACHEIMAGE=${i}
949965
fi
950966
done
951-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-3.22 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
952-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-3.22 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
953-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:riscv64-${META_TAG} -t ${MANIFESTIMAGE}:riscv64-3.22 -t ${MANIFESTIMAGE}:riscv64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER}
967+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-3.22 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
968+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
969+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-3.22 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
970+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
971+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:riscv64-${META_TAG} -t ${MANIFESTIMAGE}:riscv64-3.22 -t ${MANIFESTIMAGE}:riscv64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} || \
972+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
954973
if [ -n "${SEMVER}" ]; then
955-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
956-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
957-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:riscv64-${SEMVER} ${CACHEIMAGE}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER}
974+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
975+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
976+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
977+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
978+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:riscv64-${SEMVER} ${CACHEIMAGE}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} || \
979+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
958980
fi
959981
done
960982
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
961-
docker buildx imagetools create -t ${MANIFESTIMAGE}:3.22 ${MANIFESTIMAGE}:amd64-3.22 ${MANIFESTIMAGE}:riscv64-3.22 ${MANIFESTIMAGE}:arm64v8-3.22
962-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:riscv64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
963-
964-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:riscv64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
983+
docker buildx imagetools create -t ${MANIFESTIMAGE}:3.22 ${MANIFESTIMAGE}:amd64-3.22 ${MANIFESTIMAGE}:riscv64-3.22 ${MANIFESTIMAGE}:arm64v8-3.22 || \
984+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
985+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:riscv64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
986+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
987+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:riscv64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
988+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
965989
if [ -n "${SEMVER}" ]; then
966-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:riscv64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
990+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:riscv64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
991+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
967992
fi
968993
done
969994
'''
@@ -981,23 +1006,41 @@ pipeline {
9811006
environment name: 'EXIT_STATUS', value: ''
9821007
}
9831008
steps {
984-
echo "Pushing New tag for current commit ${META_TAG}"
985-
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
986-
-d '{"tag":"'${META_TAG}'",\
987-
"object": "'${COMMIT_SHA}'",\
988-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to 3.22",\
989-
"type": "commit",\
990-
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}' '''
991-
echo "Pushing New release for Tag"
9921009
sh '''#! /bin/bash
1010+
echo "Auto-generating release notes"
1011+
if [ "$(git tag --points-at HEAD)" != "" ]; then
1012+
echo "Existing tag points to current commit, suggesting no new LS changes"
1013+
AUTO_RELEASE_NOTES="No changes"
1014+
else
1015+
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 \
1016+
-d '{"tag_name":"'${META_TAG}'",\
1017+
"target_commitish": "3.22"}' \
1018+
| jq -r '.body' | sed 's|## What.s Changed||')
1019+
fi
1020+
echo "Pushing New tag for current commit ${META_TAG}"
1021+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1022+
-d '{"tag":"'${META_TAG}'",\
1023+
"object": "'${COMMIT_SHA}'",\
1024+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to 3.22",\
1025+
"type": "commit",\
1026+
"tagger": {"name": "LinuxServer-CI","email": "[email protected]","date": "'${GITHUB_DATE}'"}}'
1027+
echo "Pushing New release for Tag"
9931028
echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
994-
echo '{"tag_name":"'${META_TAG}'",\
995-
"target_commitish": "3.22",\
996-
"name": "'${META_TAG}'",\
997-
"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
998-
printf '","draft": false,"prerelease": false}' >> releasebody.json
999-
paste -d'\\0' start releasebody.json > releasebody.json.done
1000-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
1029+
jq -n \
1030+
--arg tag_name "$META_TAG" \
1031+
--arg target_commitish "3.22" \
1032+
--arg ci_url "${CI_URL:-N/A}" \
1033+
--arg ls_notes "$AUTO_RELEASE_NOTES" \
1034+
--arg remote_notes "$(cat releasebody.json)" \
1035+
'{
1036+
"tag_name": $tag_name,
1037+
"target_commitish": $target_commitish,
1038+
"name": $tag_name,
1039+
"body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
1040+
"draft": false,
1041+
"prerelease": false }' > releasebody.json.done
1042+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
1043+
'''
10011044
}
10021045
}
10031046
// Add protection to the release branch

0 commit comments

Comments
 (0)