Skip to content

Commit b926498

Browse files
Bot Updating Templated Files
1 parent 8d59683 commit b926498

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
@@ -120,12 +120,11 @@ pipeline {
120120
script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
121121
returnStdout: true).trim()
122122

123-
env.SEMVER = (new Date()).format('YYYY.MM.dd')
124-
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
123+
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
125124
if (semver.find()) {
126125
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
127126
} else {
128-
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
127+
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
129128
if (semver.find()) {
130129
if (semver[0][3]) {
131130
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -135,7 +134,15 @@ pipeline {
135134
}
136135
}
137136

138-
println("SEMVER: ${env.SEMVER}")
137+
if (env.SEMVER != null) {
138+
if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
139+
env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
140+
}
141+
println("SEMVER: ${env.SEMVER}")
142+
} else {
143+
println("No SEMVER detected")
144+
}
145+
139146
}
140147
}
141148
}
@@ -404,33 +411,21 @@ pipeline {
404411
steps{
405412
sh '''#! /bin/bash
406413
set -e
407-
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid')
414+
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/plex") | .uuid')
408415
if [ -z "${PACKAGE_UUID}" ]; then
409416
echo "Adding package to Scarf.sh"
410-
PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
417+
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
411418
-H "Authorization: Bearer ${SCARF_TOKEN}" \
412419
-H "Content-Type: application/json" \
413420
-d '{"name":"linuxserver/plex",\
414421
"shortDescription":"example description",\
415422
"libraryType":"docker",\
416423
"website":"https://github.com/linuxserver/docker-plex",\
417424
"backendUrl":"https://ghcr.io/linuxserver/plex",\
418-
"publicUrl":"https://lscr.io/linuxserver/plex"}' \
419-
| jq -r .uuid)
425+
"publicUrl":"https://lscr.io/linuxserver/plex"}' || :
420426
else
421427
echo "Package already exists on Scarf.sh"
422428
fi
423-
echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
424-
curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
425-
-H "Authorization: Bearer ${SCARF_TOKEN}" \
426-
-H "Content-Type: application/json" \
427-
-d '[{"userQuery":"Spad","permissionLevel":"admin"},\
428-
{"userQuery":"roxedus","permissionLevel":"admin"},\
429-
{"userQuery":"nemchik","permissionLevel":"admin"},\
430-
{"userQuery":"driz","permissionLevel":"admin"},\
431-
{"userQuery":"aptalca","permissionLevel":"admin"},\
432-
{"userQuery":"saarg","permissionLevel":"admin"},\
433-
{"userQuery":"Stark","permissionLevel":"admin"}]'
434429
'''
435430
}
436431
}
@@ -754,11 +749,15 @@ pipeline {
754749
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
755750
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
756751
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
757-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
752+
if [ -n "${SEMVER}" ]; then
753+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
754+
fi
758755
docker push ${PUSHIMAGE}:latest
759756
docker push ${PUSHIMAGE}:${META_TAG}
760757
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
761-
docker push ${PUSHIMAGE}:${SEMVER}
758+
if [ -n "${SEMVER}" ]; then
759+
docker push ${PUSHIMAGE}:${SEMVER}
760+
fi
762761
done
763762
'''
764763
}
@@ -767,8 +766,10 @@ pipeline {
767766
docker rmi \
768767
${DELETEIMAGE}:${META_TAG} \
769768
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
770-
${DELETEIMAGE}:latest \
771-
${DELETEIMAGE}:${SEMVER} || :
769+
${DELETEIMAGE}:latest || :
770+
if [ -n "${SEMVER}" ]; then
771+
docker rmi ${DELETEIMAGE}:${SEMVER} || :
772+
fi
772773
done
773774
'''
774775
}
@@ -818,9 +819,11 @@ pipeline {
818819
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
819820
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
820821
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
821-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
822-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
823-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
822+
if [ -n "${SEMVER}" ]; then
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}
826+
fi
824827
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
825828
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
826829
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -830,9 +833,11 @@ pipeline {
830833
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
831834
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
832835
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
833-
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
834-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
835-
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
836+
if [ -n "${SEMVER}" ]; then
837+
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
838+
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
839+
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
840+
fi
836841
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
837842
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
838843
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -845,14 +850,18 @@ pipeline {
845850
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
846851
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
847852
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
848-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
849-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
850-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
851-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
853+
if [ -n "${SEMVER}" ]; then
854+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
855+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
856+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
857+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
858+
fi
852859
docker manifest push --purge ${MANIFESTIMAGE}:latest
853860
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
854861
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
855-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
862+
if [ -n "${SEMVER}" ]; then
863+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
864+
fi
856865
done
857866
'''
858867
}
@@ -862,15 +871,18 @@ pipeline {
862871
${DELETEIMAGE}:amd64-${META_TAG} \
863872
${DELETEIMAGE}:amd64-latest \
864873
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
865-
${DELETEIMAGE}:amd64-${SEMVER} \
866874
${DELETEIMAGE}:arm32v7-${META_TAG} \
867875
${DELETEIMAGE}:arm32v7-latest \
868876
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
869-
${DELETEIMAGE}:arm32v7-${SEMVER} \
870877
${DELETEIMAGE}:arm64v8-${META_TAG} \
871878
${DELETEIMAGE}:arm64v8-latest \
872-
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
873-
${DELETEIMAGE}:arm64v8-${SEMVER} || :
879+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
880+
if [ -n "${SEMVER}" ]; then
881+
docker rmi \
882+
${DELETEIMAGE}:amd64-${SEMVER} \
883+
${DELETEIMAGE}:arm32v7-${SEMVER} \
884+
${DELETEIMAGE}:arm64v8-${SEMVER} || :
885+
fi
874886
done
875887
docker rmi \
876888
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \

0 commit comments

Comments
 (0)