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

Commit 810162a

Browse files
Bot Updating Templated Files
1 parent 02dca79 commit 810162a

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
@@ -56,7 +56,7 @@ pipeline {
5656
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
5757
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
5858
env.PULL_REQUEST = env.CHANGE_ID
59-
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/external_trigger.yml ./.github/workflows/package_trigger.yml'
59+
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/external_trigger.yml ./.github/workflows/package_trigger.yml'
6060
}
6161
script{
6262
env.LS_RELEASE_NUMBER = sh(
@@ -66,7 +66,7 @@ pipeline {
6666
script{
6767
env.LS_TAG_NUMBER = sh(
6868
script: '''#! /bin/bash
69-
tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
69+
tagsha=$(git rev-list -n 1 fedora-${LS_RELEASE} 2>/dev/null)
7070
if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
7171
echo ${LS_RELEASE_NUMBER}
7272
elif [ -z "${GIT_COMMIT}" ]; then
@@ -768,33 +768,33 @@ pipeline {
768768
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
769769
if [ "${CI}" == "false" ]; then
770770
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
771-
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
772771
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
772+
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
773773
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
774774
fi
775775
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
776776
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
777-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
778-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
779777
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-fedora
780-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-fedora
781-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-fedora
782778
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
779+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
780+
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-fedora
783781
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
782+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
783+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-fedora
784784
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
785785
if [ -n "${SEMVER}" ]; then
786786
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
787787
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
788788
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
789789
fi
790790
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
791-
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
792-
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
791+
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
793792
docker push ${MANIFESTIMAGE}:amd64-fedora
793+
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
794794
docker push ${MANIFESTIMAGE}:arm32v7-fedora
795-
docker push ${MANIFESTIMAGE}:arm64v8-fedora
796-
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
797795
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
796+
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
797+
docker push ${MANIFESTIMAGE}:arm64v8-fedora
798798
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
799799
if [ -n "${SEMVER}" ]; then
800800
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -936,12 +936,12 @@ pipeline {
936936
sh 'echo "build aborted"'
937937
}
938938
else if (currentBuild.currentResult == "SUCCESS"){
939-
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,\
939+
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,\
940940
"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"}],\
941941
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
942942
}
943943
else {
944-
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,\
944+
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,\
945945
"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"}],\
946946
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
947947
}

0 commit comments

Comments
 (0)