@@ -81,7 +81,7 @@ pipeline {
8181 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /commit/' + env. GIT_COMMIT
8282 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DOCKERHUB_IMAGE + ' /tags/'
8383 env. PULL_REQUEST = env. CHANGE_ID
84- 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 '
84+ 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'
8585 }
8686 sh ''' #! /bin/bash
8787 echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -309,7 +309,7 @@ pipeline {
309309 echo "Jenkinsfile is up to date."
310310 fi
311311 echo "Starting Stage 2 - Delete old templates"
312- 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"
312+ 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 "
313313 for i in ${OLD_TEMPLATES}; do
314314 if [[ -f "${i}" ]]; then
315315 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -680,6 +680,14 @@ pipeline {
680680 }
681681 sh ''' #! /bin/bash
682682 set -e
683+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
684+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
685+ if [ -n "${CI_DOCKERENV}" ]; then
686+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
687+ else
688+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
689+ fi
690+ fi
683691 docker pull ghcr.io/linuxserver/ci:latest
684692 if [ "${MULTIARCH}" == "true" ]; then
685693 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -692,15 +700,17 @@ pipeline {
692700 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
693701 -e TAGS=\" ${CI_TAGS}\" \
694702 -e META_TAG=\" ${META_TAG}\" \
703+ -e RELEASE_TAG=\" bookworm\" \
695704 -e PORT=\" ${CI_PORT}\" \
696705 -e SSL=\" ${CI_SSL}\" \
697706 -e BASE=\" ${DIST_IMAGE}\" \
698707 -e SECRET_KEY=\" ${S3_SECRET}\" \
699708 -e ACCESS_KEY=\" ${S3_KEY}\" \
700- -e DOCKER_ENV=\" LSIO_FIRST_PARTY=true| ${CI_DOCKERENV}\" \
709+ -e DOCKER_ENV=\" ${CI_DOCKERENV}\" \
701710 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
702711 -e WEB_AUTH=\" ${CI_AUTH}\" \
703712 -e WEB_PATH=\" ${CI_WEBPATH}\" \
713+ -e NODE_NAME=\" ${NODE_NAME}\" \
704714 -t ghcr.io/linuxserver/ci:latest \
705715 python3 test_build.py'''
706716 }
@@ -968,18 +978,57 @@ EOF
968978 git config --global --unset commit.gpgsign
969979 '''
970980 script{
981+ env. JOB_DATE = sh(
982+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
983+ returnStdout : true ). trim()
971984 if (env. EXIT_STATUS == " ABORTED" ){
972985 sh ' echo "build aborted"'
973986 }
974987 else if (currentBuild. currentResult == " SUCCESS" ){
988+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
989+ 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,\
990+ "footer": {"text" : "PR Build"},\
991+ "timestamp": "'${JOB_DATE}'",\
992+ "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"}],\
993+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
994+ }
995+ else if (env. GITHUBIMAGE =~ / lsiodev/ ){
996+ 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,\
997+ "footer": {"text" : "Dev Build"},\
998+ "timestamp": "'${JOB_DATE}'",\
999+ "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"}],\
1000+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1001+ }
1002+ else {
9751003 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,\
1004+ "footer": {"text" : "Live Build"},\
1005+ "timestamp": "'${JOB_DATE}'",\
9761006 "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"}],\
9771007 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1008+ }
9781009 }
9791010 else {
1011+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1012+ 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,\
1013+ "footer": {"text" : "PR Build"},\
1014+ "timestamp": "'${JOB_DATE}'",\
1015+ "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"}],\
1016+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1017+ }
1018+ else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1019+ 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,\
1020+ "footer": {"text" : "Dev Build"},\
1021+ "timestamp": "'${JOB_DATE}'",\
1022+ "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"}],\
1023+ "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1024+ }
1025+ else {
9801026 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,\
1027+ "footer": {"text" : "Live Build"},\
1028+ "timestamp": "'${JOB_DATE}'",\
9811029 "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"}],\
9821030 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1031+ }
9831032 }
9841033 }
9851034 }
0 commit comments