Skip to content

Commit 3969f61

Browse files
Bot Updating Templated Files
1 parent e4999a3 commit 3969f61

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

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

137-
println("SEMVER: ${env.SEMVER}")
136+
if (env.SEMVER != null) {
137+
if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
138+
env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
139+
}
140+
println("SEMVER: ${env.SEMVER}")
141+
} else {
142+
println("No SEMVER detected")
143+
}
144+
138145
}
139146
}
140147
}
@@ -403,33 +410,21 @@ pipeline {
403410
steps{
404411
sh '''#! /bin/bash
405412
set -e
406-
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/ldap-auth") | .uuid')
413+
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/ldap-auth") | .uuid')
407414
if [ -z "${PACKAGE_UUID}" ]; then
408415
echo "Adding package to Scarf.sh"
409-
PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \
416+
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
410417
-H "Authorization: Bearer ${SCARF_TOKEN}" \
411418
-H "Content-Type: application/json" \
412419
-d '{"name":"linuxserver/ldap-auth",\
413420
"shortDescription":"example description",\
414421
"libraryType":"docker",\
415422
"website":"https://github.com/linuxserver/docker-ldap-auth",\
416423
"backendUrl":"https://ghcr.io/linuxserver/ldap-auth",\
417-
"publicUrl":"https://lscr.io/linuxserver/ldap-auth"}' \
418-
| jq -r .uuid)
424+
"publicUrl":"https://lscr.io/linuxserver/ldap-auth"}' || :
419425
else
420426
echo "Package already exists on Scarf.sh"
421427
fi
422-
echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
423-
curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
424-
-H "Authorization: Bearer ${SCARF_TOKEN}" \
425-
-H "Content-Type: application/json" \
426-
-d '[{"userQuery":"Spad","permissionLevel":"admin"},\
427-
{"userQuery":"roxedus","permissionLevel":"admin"},\
428-
{"userQuery":"nemchik","permissionLevel":"admin"},\
429-
{"userQuery":"driz","permissionLevel":"admin"},\
430-
{"userQuery":"aptalca","permissionLevel":"admin"},\
431-
{"userQuery":"saarg","permissionLevel":"admin"},\
432-
{"userQuery":"Stark","permissionLevel":"admin"}]'
433428
'''
434429
}
435430
}
@@ -753,11 +748,15 @@ pipeline {
753748
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
754749
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
755750
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
756-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
751+
if [ -n "${SEMVER}" ]; then
752+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
753+
fi
757754
docker push ${PUSHIMAGE}:latest
758755
docker push ${PUSHIMAGE}:${META_TAG}
759756
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
760-
docker push ${PUSHIMAGE}:${SEMVER}
757+
if [ -n "${SEMVER}" ]; then
758+
docker push ${PUSHIMAGE}:${SEMVER}
759+
fi
761760
done
762761
'''
763762
}
@@ -766,8 +765,10 @@ pipeline {
766765
docker rmi \
767766
${DELETEIMAGE}:${META_TAG} \
768767
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
769-
${DELETEIMAGE}:latest \
770-
${DELETEIMAGE}:${SEMVER} || :
768+
${DELETEIMAGE}:latest || :
769+
if [ -n "${SEMVER}" ]; then
770+
docker rmi ${DELETEIMAGE}:${SEMVER} || :
771+
fi
771772
done
772773
'''
773774
}
@@ -817,9 +818,11 @@ pipeline {
817818
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
818819
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
819820
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
820-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
821-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
822-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
821+
if [ -n "${SEMVER}" ]; then
822+
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
823+
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
824+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
825+
fi
823826
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
824827
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
825828
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -829,9 +832,11 @@ pipeline {
829832
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
830833
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
831834
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
832-
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
833-
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
834-
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
835+
if [ -n "${SEMVER}" ]; then
836+
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
837+
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
838+
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
839+
fi
835840
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
836841
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
837842
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -844,14 +849,18 @@ pipeline {
844849
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
845850
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
846851
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
847-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
848-
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
849-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
850-
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
852+
if [ -n "${SEMVER}" ]; then
853+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
854+
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
855+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
856+
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
857+
fi
851858
docker manifest push --purge ${MANIFESTIMAGE}:latest
852859
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
853860
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
854-
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
861+
if [ -n "${SEMVER}" ]; then
862+
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
863+
fi
855864
done
856865
'''
857866
}
@@ -861,15 +870,18 @@ pipeline {
861870
${DELETEIMAGE}:amd64-${META_TAG} \
862871
${DELETEIMAGE}:amd64-latest \
863872
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
864-
${DELETEIMAGE}:amd64-${SEMVER} \
865873
${DELETEIMAGE}:arm32v7-${META_TAG} \
866874
${DELETEIMAGE}:arm32v7-latest \
867875
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
868-
${DELETEIMAGE}:arm32v7-${SEMVER} \
869876
${DELETEIMAGE}:arm64v8-${META_TAG} \
870877
${DELETEIMAGE}:arm64v8-latest \
871-
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
872-
${DELETEIMAGE}:arm64v8-${SEMVER} || :
878+
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
879+
if [ -n "${SEMVER}" ]; then
880+
docker rmi \
881+
${DELETEIMAGE}:amd64-${SEMVER} \
882+
${DELETEIMAGE}:arm32v7-${SEMVER} \ \
883+
${DELETEIMAGE}:arm64v8-${SEMVER} || :
884+
fi
873885
done
874886
docker rmi \
875887
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \

0 commit comments

Comments
 (0)