Skip to content

Commit 263ea2a

Browse files
Bot Updating Templated Files
1 parent 7acfad5 commit 263ea2a

File tree

1 file changed

+50
-38
lines changed

1 file changed

+50
-38
lines changed

Jenkinsfile

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,11 @@ pipeline {
122122
script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
123123
returnStdout: true).trim()
124124

125-
env.SEMVER = (new Date()).format('YYYY.MM.dd')
126-
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
125+
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
127126
if (semver.find()) {
128127
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
129128
} else {
130-
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
129+
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
131130
if (semver.find()) {
132131
if (semver[0][3]) {
133132
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -137,7 +136,15 @@ pipeline {
137136
}
138137
}
139138

140-
println("SEMVER: ${env.SEMVER}")
139+
if (env.SEMVER != null) {
140+
if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
141+
env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
142+
}
143+
println("SEMVER: ${env.SEMVER}")
144+
} else {
145+
println("No SEMVER detected")
146+
}
147+
141148
}
142149
}
143150
}
@@ -406,33 +413,21 @@ pipeline {
406413
steps{
407414
sh '''#! /bin/bash
408415
set -e
409-
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/syslog-ng") | .uuid')
416+
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/syslog-ng") | .uuid')
410417
if [ -z "${PACKAGE_UUID}" ]; then
411418
echo "Adding package to Scarf.sh"
412-
PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
419+
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
413420
-H "Authorization: Bearer ${SCARF_TOKEN}" \
414421
-H "Content-Type: application/json" \
415422
-d '{"name":"linuxserver/syslog-ng",\
416423
"shortDescription":"example description",\
417424
"libraryType":"docker",\
418425
"website":"https://github.com/linuxserver/docker-syslog-ng",\
419426
"backendUrl":"https://ghcr.io/linuxserver/syslog-ng",\
420-
"publicUrl":"https://lscr.io/linuxserver/syslog-ng"}' \
421-
| jq -r .uuid)
427+
"publicUrl":"https://lscr.io/linuxserver/syslog-ng"}' || :
422428
else
423429
echo "Package already exists on Scarf.sh"
424430
fi
425-
echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
426-
curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
427-
-H "Authorization: Bearer ${SCARF_TOKEN}" \
428-
-H "Content-Type: application/json" \
429-
-d '[{"userQuery":"Spad","permissionLevel":"admin"},\
430-
{"userQuery":"roxedus","permissionLevel":"admin"},\
431-
{"userQuery":"nemchik","permissionLevel":"admin"},\
432-
{"userQuery":"driz","permissionLevel":"admin"},\
433-
{"userQuery":"aptalca","permissionLevel":"admin"},\
434-
{"userQuery":"saarg","permissionLevel":"admin"},\
435-
{"userQuery":"Stark","permissionLevel":"admin"}]'
436431
'''
437432
}
438433
}
@@ -756,11 +751,15 @@ pipeline {
756751
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
757752
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
758753
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
759-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
754+
if [ -n "${SEMVER}" ]; then
755+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
756+
fi
760757
docker push ${PUSHIMAGE}:latest
761758
docker push ${PUSHIMAGE}:${META_TAG}
762759
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
763-
docker push ${PUSHIMAGE}:${SEMVER}
760+
if [ -n "${SEMVER}" ]; then
761+
docker push ${PUSHIMAGE}:${SEMVER}
762+
fi
764763
done
765764
'''
766765
}
@@ -769,8 +768,10 @@ pipeline {
769768
docker rmi \
770769
${DELETEIMAGE}:${META_TAG} \
771770
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
772-
${DELETEIMAGE}:latest \
773-
${DELETEIMAGE}:${SEMVER} || :
771+
${DELETEIMAGE}:latest || :
772+
if [ -n "${SEMVER}" ]; then
773+
docker rmi ${DELETEIMAGE}:${SEMVER} || :
774+
fi
774775
done
775776
'''
776777
}
@@ -820,9 +821,11 @@ pipeline {
820821
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
821822
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
822823
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
823-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
824-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
825-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
824+
if [ -n "${SEMVER}" ]; then
825+
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
826+
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
827+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
828+
fi
826829
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
827830
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
828831
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -832,9 +835,11 @@ pipeline {
832835
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
833836
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
834837
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
835-
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
836-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
837-
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
838+
if [ -n "${SEMVER}" ]; then
839+
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
840+
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
841+
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
842+
fi
838843
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
839844
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
840845
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -847,14 +852,18 @@ pipeline {
847852
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
848853
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
849854
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
850-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
851-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
852-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
853-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
855+
if [ -n "${SEMVER}" ]; then
856+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
857+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
858+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
859+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
860+
fi
854861
docker manifest push --purge ${MANIFESTIMAGE}:latest
855862
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
856863
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
857-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
864+
if [ -n "${SEMVER}" ]; then
865+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
866+
fi
858867
done
859868
'''
860869
}
@@ -864,15 +873,18 @@ pipeline {
864873
${DELETEIMAGE}:amd64-${META_TAG} \
865874
${DELETEIMAGE}:amd64-latest \
866875
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
867-
${DELETEIMAGE}:amd64-${SEMVER} \
868876
${DELETEIMAGE}:arm32v7-${META_TAG} \
869877
${DELETEIMAGE}:arm32v7-latest \
870878
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
871-
${DELETEIMAGE}:arm32v7-${SEMVER} \
872879
${DELETEIMAGE}:arm64v8-${META_TAG} \
873880
${DELETEIMAGE}:arm64v8-latest \
874-
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
875-
${DELETEIMAGE}:arm64v8-${SEMVER} || :
881+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
882+
if [ -n "${SEMVER}" ]; then
883+
docker rmi \
884+
${DELETEIMAGE}:amd64-${SEMVER} \
885+
${DELETEIMAGE}:arm32v7-${SEMVER} \
886+
${DELETEIMAGE}:arm64v8-${SEMVER} || :
887+
fi
876888
done
877889
docker rmi \
878890
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \

0 commit comments

Comments
 (0)