@@ -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}" '''
@@ -314,7 +314,7 @@ pipeline {
314314 echo "Jenkinsfile is up to date."
315315 fi
316316 echo "Starting Stage 2 - Delete old templates"
317- 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"
317+ 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 "
318318 for i in ${OLD_TEMPLATES}; do
319319 if [[ -f "${i}" ]]; then
320320 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -722,6 +722,14 @@ pipeline {
722722 }
723723 sh ''' #! /bin/bash
724724 set -e
725+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
726+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
727+ if [ -n "${CI_DOCKERENV}" ]; then
728+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
729+ else
730+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
731+ fi
732+ fi
725733 docker pull ghcr.io/linuxserver/ci:latest
726734 if [ "${MULTIARCH}" == "true" ]; then
727735 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -734,6 +742,7 @@ pipeline {
734742 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
735743 -e TAGS=\" ${CI_TAGS}\" \
736744 -e META_TAG=\" ${META_TAG}\" \
745+ -e RELEASE_TAG=\" latest\" \
737746 -e PORT=\" ${CI_PORT}\" \
738747 -e SSL=\" ${CI_SSL}\" \
739748 -e BASE=\" ${DIST_IMAGE}\" \
@@ -743,6 +752,7 @@ pipeline {
743752 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
744753 -e WEB_AUTH=\" ${CI_AUTH}\" \
745754 -e WEB_PATH=\" ${CI_WEBPATH}\" \
755+ -e NODE_NAME=\" ${NODE_NAME}\" \
746756 -t ghcr.io/linuxserver/ci:latest \
747757 python3 test_build.py'''
748758 }
@@ -1010,17 +1020,45 @@ EOF
10101020 git config --global --unset commit.gpgsign
10111021 '''
10121022 script{
1023+ env. JOB_DATE = sh(
1024+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
1025+ returnStdout : true ). trim()
10131026 if (env. EXIT_STATUS == " ABORTED" ){
10141027 sh ' echo "build aborted"'
1015- }
1016- else if (currentBuild. currentResult == " SUCCESS" ){
1017- 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,\
1018- "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"}],\
1019- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1020- }
1021- else {
1022- 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,\
1023- "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"}],\
1028+ }else {
1029+ if (currentBuild. currentResult == " SUCCESS" ){
1030+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1031+ env. JOB_WEBHOOK_STATUS = ' Success'
1032+ env. JOB_WEBHOOK_COLOUR = 3957028
1033+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1034+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1035+ env. JOB_WEBHOOK_STATUS = ' Success'
1036+ env. JOB_WEBHOOK_COLOUR = 3957028
1037+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1038+ }else {
1039+ env. JOB_WEBHOOK_STATUS = ' Success'
1040+ env. JOB_WEBHOOK_COLOUR = 1681177
1041+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1042+ }
1043+ }else {
1044+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1045+ env. JOB_WEBHOOK_STATUS = ' Failure'
1046+ env. JOB_WEBHOOK_COLOUR = 12669523
1047+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1048+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1049+ env. JOB_WEBHOOK_STATUS = ' Failure'
1050+ env. JOB_WEBHOOK_COLOUR = 12669523
1051+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1052+ }else {
1053+ env. JOB_WEBHOOK_STATUS = ' Failure'
1054+ env. JOB_WEBHOOK_COLOUR = 16711680
1055+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1056+ }
1057+ }
1058+ 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'": '${JOB_WEBHOOK_COLOUR}',\
1059+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
1060+ "timestamp": "'${JOB_DATE}'",\
1061+ "description": "**Build:** '${BUILD_NUMBER}'\\ n**CI Results:** '${CI_URL}'\\ n**ShellCheck Results:** '${SHELLCHECK_URL}'\\ n**Status:** '${JOB_WEBHOOK_STATUS}'\\ n**Job:** '${RUN_DISPLAY_URL}'\\ n**Change:** '${CODE_URL}'\\ n**External Release:**: '${RELEASE_LINK}'\\ n**DockerHub:** '${DOCKERHUB_LINK}'\\ n"}],\
10241062 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
10251063 }
10261064 }
0 commit comments