@@ -84,7 +84,7 @@ pipeline {
8484 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /commit/' + env. GIT_COMMIT
8585 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DOCKERHUB_IMAGE + ' /tags/'
8686 env. PULL_REQUEST = env. CHANGE_ID
87- 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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml '
87+ 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/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
8888 }
8989 sh ''' #! /bin/bash
9090 echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -315,7 +315,7 @@ pipeline {
315315 echo "Jenkinsfile is up to date."
316316 fi
317317 echo "Starting Stage 2 - Delete old templates"
318- OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
318+ OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml "
319319 for i in ${OLD_TEMPLATES}; do
320320 if [[ -f "${i}" ]]; then
321321 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -723,6 +723,14 @@ pipeline {
723723 }
724724 sh ''' #! /bin/bash
725725 set -e
726+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
727+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
728+ if [ -n "${CI_DOCKERENV}" ]; then
729+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
730+ else
731+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
732+ fi
733+ fi
726734 docker pull ghcr.io/linuxserver/ci:latest
727735 if [ "${MULTIARCH}" == "true" ]; then
728736 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -735,6 +743,7 @@ pipeline {
735743 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
736744 -e TAGS=\" ${CI_TAGS}\" \
737745 -e META_TAG=\" ${META_TAG}\" \
746+ -e RELEASE_TAG=\" latest\" \
738747 -e PORT=\" ${CI_PORT}\" \
739748 -e SSL=\" ${CI_SSL}\" \
740749 -e BASE=\" ${DIST_IMAGE}\" \
@@ -744,6 +753,7 @@ pipeline {
744753 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
745754 -e WEB_AUTH=\" ${CI_AUTH}\" \
746755 -e WEB_PATH=\" ${CI_WEBPATH}\" \
756+ -e NODE_NAME=\" ${NODE_NAME}\" \
747757 -t ghcr.io/linuxserver/ci:latest \
748758 python3 test_build.py'''
749759 }
@@ -1011,18 +1021,57 @@ EOF
10111021 git config --global --unset commit.gpgsign
10121022 '''
10131023 script{
1024+ env. JOB_DATE = sh(
1025+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
1026+ returnStdout : true ). trim()
10141027 if (env. EXIT_STATUS == " ABORTED" ){
10151028 sh ' echo "build aborted"'
10161029 }
10171030 else if (currentBuild. currentResult == " SUCCESS" ){
1031+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1032+ 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": 3957028,\
1033+ "footer": {"text" : "PR Build"},\
1034+ "timestamp": "'${JOB_DATE}'",\
1035+ "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"}],\
1036+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1037+ }
1038+ else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1039+ 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": 3957028,\
1040+ "footer": {"text" : "Dev Build"},\
1041+ "timestamp": "'${JOB_DATE}'",\
1042+ "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"}],\
1043+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1044+ }
1045+ else {
10181046 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,\
1047+ "footer": {"text" : "Live Build"},\
1048+ "timestamp": "'${JOB_DATE}'",\
10191049 "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"}],\
10201050 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1051+ }
10211052 }
10221053 else {
1054+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1055+ 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": 12669523,\
1056+ "footer": {"text" : "PR Build"},\
1057+ "timestamp": "'${JOB_DATE}'",\
1058+ "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"}],\
1059+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1060+ }
1061+ else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1062+ 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": 12669523,\
1063+ "footer": {"text" : "Dev Build"},\
1064+ "timestamp": "'${JOB_DATE}'",\
1065+ "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"}],\
1066+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1067+ }
1068+ else {
10231069 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,\
1070+ "footer": {"text" : "Live Build"},\
1071+ "timestamp": "'${JOB_DATE}'",\
10241072 "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"}],\
10251073 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1074+ }
10261075 }
10271076 }
10281077 }
0 commit comments