Skip to content

Commit bdd95cb

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent 07d24df commit bdd95cb

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

121-
env.SEMVER = (new Date()).format('YYYY.MM.dd')
122-
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/
121+
def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
123122
if (semver.find()) {
124123
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
125124
} else {
126-
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/
125+
semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
127126
if (semver.find()) {
128127
if (semver[0][3]) {
129128
env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
@@ -133,7 +132,15 @@ pipeline {
133132
}
134133
}
135134

136-
println("SEMVER: ${env.SEMVER}")
135+
if (env.SEMVER != null) {
136+
if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
137+
env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
138+
}
139+
println("SEMVER: ${env.SEMVER}")
140+
} else {
141+
println("No SEMVER detected")
142+
}
143+
137144
}
138145
}
139146
}
@@ -402,33 +409,21 @@ pipeline {
402409
steps{
403410
sh '''#! /bin/bash
404411
set -e
405-
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/sqlitebrowser") | .uuid')
412+
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/sqlitebrowser") | .uuid')
406413
if [ -z "${PACKAGE_UUID}" ]; then
407414
echo "Adding package to Scarf.sh"
408-
PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
415+
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
409416
-H "Authorization: Bearer ${SCARF_TOKEN}" \
410417
-H "Content-Type: application/json" \
411418
-d '{"name":"linuxserver/sqlitebrowser",\
412419
"shortDescription":"example description",\
413420
"libraryType":"docker",\
414421
"website":"https://github.com/linuxserver/docker-sqlitebrowser",\
415422
"backendUrl":"https://ghcr.io/linuxserver/sqlitebrowser",\
416-
"publicUrl":"https://lscr.io/linuxserver/sqlitebrowser"}' \
417-
| jq -r .uuid)
423+
"publicUrl":"https://lscr.io/linuxserver/sqlitebrowser"}' || :
418424
else
419425
echo "Package already exists on Scarf.sh"
420426
fi
421-
echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
422-
curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
423-
-H "Authorization: Bearer ${SCARF_TOKEN}" \
424-
-H "Content-Type: application/json" \
425-
-d '[{"userQuery":"Spad","permissionLevel":"admin"},\
426-
{"userQuery":"roxedus","permissionLevel":"admin"},\
427-
{"userQuery":"nemchik","permissionLevel":"admin"},\
428-
{"userQuery":"driz","permissionLevel":"admin"},\
429-
{"userQuery":"aptalca","permissionLevel":"admin"},\
430-
{"userQuery":"saarg","permissionLevel":"admin"},\
431-
{"userQuery":"Stark","permissionLevel":"admin"}]'
432427
'''
433428
}
434429
}
@@ -752,11 +747,15 @@ pipeline {
752747
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
753748
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
754749
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
755-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
750+
if [ -n "${SEMVER}" ]; then
751+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
752+
fi
756753
docker push ${PUSHIMAGE}:latest
757754
docker push ${PUSHIMAGE}:${META_TAG}
758755
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
759-
docker push ${PUSHIMAGE}:${SEMVER}
756+
if [ -n "${SEMVER}" ]; then
757+
docker push ${PUSHIMAGE}:${SEMVER}
758+
fi
760759
done
761760
'''
762761
}
@@ -765,8 +764,10 @@ pipeline {
765764
docker rmi \
766765
${DELETEIMAGE}:${META_TAG} \
767766
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
768-
${DELETEIMAGE}:latest \
769-
${DELETEIMAGE}:${SEMVER} || :
767+
${DELETEIMAGE}:latest || :
768+
if [ -n "${SEMVER}" ]; then
769+
docker rmi ${DELETEIMAGE}:${SEMVER} || :
770+
fi
770771
done
771772
'''
772773
}
@@ -816,9 +817,11 @@ pipeline {
816817
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
817818
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
818819
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
819-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
820-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
821-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
820+
if [ -n "${SEMVER}" ]; then
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}
824+
fi
822825
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
823826
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
824827
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -828,9 +831,11 @@ pipeline {
828831
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
829832
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
830833
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
831-
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
832-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
833-
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
834+
if [ -n "${SEMVER}" ]; then
835+
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
836+
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
837+
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
838+
fi
834839
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
835840
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
836841
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -843,14 +848,18 @@ pipeline {
843848
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
844849
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
845850
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
846-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
847-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
848-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
849-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
851+
if [ -n "${SEMVER}" ]; then
852+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
853+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
854+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
855+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
856+
fi
850857
docker manifest push --purge ${MANIFESTIMAGE}:latest
851858
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
852859
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
853-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
860+
if [ -n "${SEMVER}" ]; then
861+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
862+
fi
854863
done
855864
'''
856865
}
@@ -860,15 +869,18 @@ pipeline {
860869
${DELETEIMAGE}:amd64-${META_TAG} \
861870
${DELETEIMAGE}:amd64-latest \
862871
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
863-
${DELETEIMAGE}:amd64-${SEMVER} \
864872
${DELETEIMAGE}:arm32v7-${META_TAG} \
865873
${DELETEIMAGE}:arm32v7-latest \
866874
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
867-
${DELETEIMAGE}:arm32v7-${SEMVER} \
868875
${DELETEIMAGE}:arm64v8-${META_TAG} \
869876
${DELETEIMAGE}:arm64v8-latest \
870-
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
871-
${DELETEIMAGE}:arm64v8-${SEMVER} || :
877+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
878+
if [ -n "${SEMVER}" ]; then
879+
docker rmi \
880+
${DELETEIMAGE}:amd64-${SEMVER} \
881+
${DELETEIMAGE}:arm32v7-${SEMVER} \
882+
${DELETEIMAGE}:arm64v8-${SEMVER} || :
883+
fi
872884
done
873885
docker rmi \
874886
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \

0 commit comments

Comments
 (0)