@@ -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}" '''
@@ -311,7 +311,7 @@ pipeline {
311311 echo "Jenkinsfile is up to date."
312312 fi
313313 echo "Starting Stage 2 - Delete old templates"
314- 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"
314+ 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 "
315315 for i in ${OLD_TEMPLATES}; do
316316 if [[ -f "${i}" ]]; then
317317 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -719,6 +719,14 @@ pipeline {
719719 }
720720 sh ''' #! /bin/bash
721721 set -e
722+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
723+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
724+ if [ -n "${CI_DOCKERENV}" ]; then
725+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
726+ else
727+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
728+ fi
729+ fi
722730 docker pull ghcr.io/linuxserver/ci:latest
723731 if [ "${MULTIARCH}" == "true" ]; then
724732 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -731,6 +739,7 @@ pipeline {
731739 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
732740 -e TAGS=\" ${CI_TAGS}\" \
733741 -e META_TAG=\" ${META_TAG}\" \
742+ -e RELEASE_TAG=\" latest\" \
734743 -e PORT=\" ${CI_PORT}\" \
735744 -e SSL=\" ${CI_SSL}\" \
736745 -e BASE=\" ${DIST_IMAGE}\" \
@@ -740,6 +749,7 @@ pipeline {
740749 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
741750 -e WEB_AUTH=\" ${CI_AUTH}\" \
742751 -e WEB_PATH=\" ${CI_WEBPATH}\" \
752+ -e NODE_NAME=\" ${NODE_NAME}\" \
743753 -t ghcr.io/linuxserver/ci:latest \
744754 python3 test_build.py'''
745755 }
@@ -1007,17 +1017,45 @@ EOF
10071017 git config --global --unset commit.gpgsign
10081018 '''
10091019 script{
1020+ env. JOB_DATE = sh(
1021+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
1022+ returnStdout : true ). trim()
10101023 if (env. EXIT_STATUS == " ABORTED" ){
10111024 sh ' echo "build aborted"'
1012- }
1013- else if (currentBuild. currentResult == " SUCCESS" ){
1014- 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,\
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 {
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": 16711680,\
1020- "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"}],\
1025+ }else {
1026+ if (currentBuild. currentResult == " SUCCESS" ){
1027+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1028+ env. JOB_WEBHOOK_STATUS = ' Success'
1029+ env. JOB_WEBHOOK_COLOUR = 3957028
1030+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1031+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1032+ env. JOB_WEBHOOK_STATUS = ' Success'
1033+ env. JOB_WEBHOOK_COLOUR = 3957028
1034+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1035+ }else {
1036+ env. JOB_WEBHOOK_STATUS = ' Success'
1037+ env. JOB_WEBHOOK_COLOUR = 1681177
1038+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1039+ }
1040+ }else {
1041+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1042+ env. JOB_WEBHOOK_STATUS = ' Failure'
1043+ env. JOB_WEBHOOK_COLOUR = 12669523
1044+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1045+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1046+ env. JOB_WEBHOOK_STATUS = ' Failure'
1047+ env. JOB_WEBHOOK_COLOUR = 12669523
1048+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1049+ }else {
1050+ env. JOB_WEBHOOK_STATUS = ' Failure'
1051+ env. JOB_WEBHOOK_COLOUR = 16711680
1052+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1053+ }
1054+ }
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'": '${JOB_WEBHOOK_COLOUR}',\
1056+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
1057+ "timestamp": "'${JOB_DATE}'",\
1058+ "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"}],\
10211059 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
10221060 }
10231061 }
0 commit comments