@@ -83,7 +83,7 @@ pipeline {
8383 env. CODE_URL = ' https://github.com/' + env. LS_USER + ' /' + env. LS_REPO + ' /commit/' + env. GIT_COMMIT
8484 env. DOCKERHUB_LINK = ' https://hub.docker.com/r/' + env. DOCKERHUB_IMAGE + ' /tags/'
8585 env. PULL_REQUEST = env. CHANGE_ID
86- 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 '
86+ 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'
8787 }
8888 sh ''' #! /bin/bash
8989 echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -313,7 +313,7 @@ pipeline {
313313 echo "Jenkinsfile is up to date."
314314 fi
315315 echo "Starting Stage 2 - Delete old templates"
316- 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"
316+ 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 "
317317 for i in ${OLD_TEMPLATES}; do
318318 if [[ -f "${i}" ]]; then
319319 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -721,6 +721,14 @@ pipeline {
721721 }
722722 sh ''' #! /bin/bash
723723 set -e
724+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
725+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
726+ if [ -n "${CI_DOCKERENV}" ]; then
727+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
728+ else
729+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
730+ fi
731+ fi
724732 docker pull ghcr.io/linuxserver/ci:latest
725733 if [ "${MULTIARCH}" == "true" ]; then
726734 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -733,6 +741,7 @@ pipeline {
733741 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
734742 -e TAGS=\" ${CI_TAGS}\" \
735743 -e META_TAG=\" ${META_TAG}\" \
744+ -e RELEASE_TAG=\" latest\" \
736745 -e PORT=\" ${CI_PORT}\" \
737746 -e SSL=\" ${CI_SSL}\" \
738747 -e BASE=\" ${DIST_IMAGE}\" \
@@ -742,6 +751,7 @@ pipeline {
742751 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
743752 -e WEB_AUTH=\" ${CI_AUTH}\" \
744753 -e WEB_PATH=\" ${CI_WEBPATH}\" \
754+ -e NODE_NAME=\" ${NODE_NAME}\" \
745755 -t ghcr.io/linuxserver/ci:latest \
746756 python3 test_build.py'''
747757 }
@@ -1009,17 +1019,45 @@ EOF
10091019 git config --global --unset commit.gpgsign
10101020 '''
10111021 script{
1022+ env. JOB_DATE = sh(
1023+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
1024+ returnStdout : true ). trim()
10121025 if (env. EXIT_STATUS == " ABORTED" ){
10131026 sh ' echo "build aborted"'
1014- }
1015- else if (currentBuild. currentResult == " SUCCESS" ){
1016- 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,\
1017- "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"}],\
1018- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1019- }
1020- else {
1021- 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,\
1022- "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"}],\
1027+ }else {
1028+ if (currentBuild. currentResult == " SUCCESS" ){
1029+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1030+ env. JOB_WEBHOOK_STATUS = ' Success'
1031+ env. JOB_WEBHOOK_COLOUR = 3957028
1032+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1033+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1034+ env. JOB_WEBHOOK_STATUS = ' Success'
1035+ env. JOB_WEBHOOK_COLOUR = 3957028
1036+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1037+ }else {
1038+ env. JOB_WEBHOOK_STATUS = ' Success'
1039+ env. JOB_WEBHOOK_COLOUR = 1681177
1040+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1041+ }
1042+ }else {
1043+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1044+ env. JOB_WEBHOOK_STATUS = ' Failure'
1045+ env. JOB_WEBHOOK_COLOUR = 12669523
1046+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1047+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1048+ env. JOB_WEBHOOK_STATUS = ' Failure'
1049+ env. JOB_WEBHOOK_COLOUR = 12669523
1050+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1051+ }else {
1052+ env. JOB_WEBHOOK_STATUS = ' Failure'
1053+ env. JOB_WEBHOOK_COLOUR = 16711680
1054+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1055+ }
1056+ }
1057+ 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}',\
1058+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
1059+ "timestamp": "'${JOB_DATE}'",\
1060+ "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"}],\
10231061 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
10241062 }
10251063 }
0 commit comments