Skip to content
This repository was archived by the owner on Feb 19, 2022. It is now read-only.

Commit 900b0fe

Browse files
Bot Updating Templated Files
1 parent bd1f7ce commit 900b0fe

File tree

1 file changed

+50
-38
lines changed

1 file changed

+50
-38
lines changed

Diff for: Jenkinsfile

+50-38
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,11 @@ pipeline {
128128
script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
129129
returnStdout: true).trim()
130130

131-
env.SEMVER = (new Date()).format('YYYY.MM.dd')
132-
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
131+
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
133132
if (semver.find()) {
134133
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
135134
} else {
136-
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
135+
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
137136
if (semver.find()) {
138137
if (semver[0][3]) {
139138
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -143,7 +142,15 @@ pipeline {
143142
}
144143
}
145144

146-
println("SEMVER: ${env.SEMVER}")
145+
if (env.SEMVER != null) {
146+
if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
147+
env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
148+
}
149+
println("SEMVER: ${env.SEMVER}")
150+
} else {
151+
println("No SEMVER detected")
152+
}
153+
147154
}
148155
}
149156
}
@@ -418,33 +425,21 @@ pipeline {
418425
steps{
419426
sh '''#! /bin/bash
420427
set -e
421-
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/booksonic") | .uuid')
428+
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/booksonic") | .uuid')
422429
if [ -z "${PACKAGE_UUID}" ]; then
423430
echo "Adding package to Scarf.sh"
424-
PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
431+
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
425432
-H "Authorization: Bearer ${SCARF_TOKEN}" \
426433
-H "Content-Type: application/json" \
427434
-d '{"name":"linuxserver/booksonic",\
428435
"shortDescription":"example description",\
429436
"libraryType":"docker",\
430437
"website":"https://github.com/linuxserver/docker-booksonic",\
431438
"backendUrl":"https://ghcr.io/linuxserver/booksonic",\
432-
"publicUrl":"https://lscr.io/linuxserver/booksonic"}' \
433-
| jq -r .uuid)
439+
"publicUrl":"https://lscr.io/linuxserver/booksonic"}' || :
434440
else
435441
echo "Package already exists on Scarf.sh"
436442
fi
437-
echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
438-
curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
439-
-H "Authorization: Bearer ${SCARF_TOKEN}" \
440-
-H "Content-Type: application/json" \
441-
-d '[{"userQuery":"Spad","permissionLevel":"admin"},\
442-
{"userQuery":"roxedus","permissionLevel":"admin"},\
443-
{"userQuery":"nemchik","permissionLevel":"admin"},\
444-
{"userQuery":"driz","permissionLevel":"admin"},\
445-
{"userQuery":"aptalca","permissionLevel":"admin"},\
446-
{"userQuery":"saarg","permissionLevel":"admin"},\
447-
{"userQuery":"Stark","permissionLevel":"admin"}]'
448443
'''
449444
}
450445
}
@@ -768,11 +763,15 @@ pipeline {
768763
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
769764
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
770765
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
771-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
766+
if [ -n "${SEMVER}" ]; then
767+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
768+
fi
772769
docker push ${PUSHIMAGE}:latest
773770
docker push ${PUSHIMAGE}:${META_TAG}
774771
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
775-
docker push ${PUSHIMAGE}:${SEMVER}
772+
if [ -n "${SEMVER}" ]; then
773+
docker push ${PUSHIMAGE}:${SEMVER}
774+
fi
776775
done
777776
'''
778777
}
@@ -781,8 +780,10 @@ pipeline {
781780
docker rmi \
782781
${DELETEIMAGE}:${META_TAG} \
783782
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
784-
${DELETEIMAGE}:latest \
785-
${DELETEIMAGE}:${SEMVER} || :
783+
${DELETEIMAGE}:latest || :
784+
if [ -n "${SEMVER}" ]; then
785+
docker rmi ${DELETEIMAGE}:${SEMVER} || :
786+
fi
786787
done
787788
'''
788789
}
@@ -832,9 +833,11 @@ pipeline {
832833
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
833834
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
834835
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
835-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
836-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
837-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
836+
if [ -n "${SEMVER}" ]; then
837+
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
838+
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
839+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
840+
fi
838841
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
839842
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
840843
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -844,9 +847,11 @@ pipeline {
844847
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
845848
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
846849
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
847-
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
848-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
849-
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
850+
if [ -n "${SEMVER}" ]; then
851+
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
852+
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
853+
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
854+
fi
850855
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
851856
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
852857
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -859,14 +864,18 @@ pipeline {
859864
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
860865
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
861866
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
862-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
863-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
864-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
865-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
867+
if [ -n "${SEMVER}" ]; then
868+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
869+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
870+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
871+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
872+
fi
866873
docker manifest push --purge ${MANIFESTIMAGE}:latest
867874
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
868875
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
869-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
876+
if [ -n "${SEMVER}" ]; then
877+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
878+
fi
870879
done
871880
'''
872881
}
@@ -876,15 +885,18 @@ pipeline {
876885
${DELETEIMAGE}:amd64-${META_TAG} \
877886
${DELETEIMAGE}:amd64-latest \
878887
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
879-
${DELETEIMAGE}:amd64-${SEMVER} \
880888
${DELETEIMAGE}:arm32v7-${META_TAG} \
881889
${DELETEIMAGE}:arm32v7-latest \
882890
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
883-
${DELETEIMAGE}:arm32v7-${SEMVER} \
884891
${DELETEIMAGE}:arm64v8-${META_TAG} \
885892
${DELETEIMAGE}:arm64v8-latest \
886-
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
887-
${DELETEIMAGE}:arm64v8-${SEMVER} || :
893+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
894+
if [ -n "${SEMVER}" ]; then
895+
docker rmi \
896+
${DELETEIMAGE}:amd64-${SEMVER} \
897+
${DELETEIMAGE}:arm32v7-${SEMVER} \
898+
${DELETEIMAGE}:arm64v8-${SEMVER} || :
899+
fi
888900
done
889901
docker rmi \
890902
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \

0 commit comments

Comments
 (0)