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

Commit c58480f

Browse files
Bot Updating Templated Files
1 parent 99c219d commit c58480f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Jenkinsfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pipeline {
5959
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
6060
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
6161
env.PULL_REQUEST = env.CHANGE_ID
62-
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml'
62+
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/package_trigger.yml'
6363
}
6464
script{
6565
env.LS_RELEASE_NUMBER = sh(
@@ -69,7 +69,7 @@ pipeline {
6969
script{
7070
env.LS_TAG_NUMBER = sh(
7171
script: '''#! /bin/bash
72-
tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
72+
tagsha=$(git rev-list -n 1 v2-${LS_RELEASE} 2>/dev/null)
7373
if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
7474
echo ${LS_RELEASE_NUMBER}
7575
elif [ -z "${GIT_COMMIT}" ]; then
@@ -788,33 +788,33 @@ pipeline {
788788
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
789789
if [ "${CI}" == "false" ]; then
790790
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
791-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
792791
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
792+
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
793793
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
794794
fi
795795
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
796796
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
797-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
798-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
799797
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-v2
800-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-v2
801-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-v2
802798
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
799+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
800+
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-v2
803801
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
802+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
803+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-v2
804804
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
805805
if [ -n "${SEMVER}" ]; then
806806
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
807807
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
808808
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
809809
fi
810810
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
811-
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
812-
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
811+
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
813812
docker push ${MANIFESTIMAGE}:amd64-v2
813+
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
814814
docker push ${MANIFESTIMAGE}:arm32v7-v2
815-
docker push ${MANIFESTIMAGE}:arm64v8-v2
816-
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
817815
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
816+
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
817+
docker push ${MANIFESTIMAGE}:arm64v8-v2
818818
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
819819
if [ -n "${SEMVER}" ]; then
820820
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -960,12 +960,12 @@ pipeline {
960960
sh 'echo "build aborted"'
961961
}
962962
else if (currentBuild.currentResult == "SUCCESS"){
963-
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
963+
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
964964
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
965965
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
966966
}
967967
else {
968-
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
968+
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
969969
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
970970
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
971971
}

0 commit comments

Comments
 (0)