@@ -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}" '''
@@ -321,7 +321,7 @@ pipeline {
321321 echo "Jenkinsfile is up to date."
322322 fi
323323 echo "Starting Stage 2 - Delete old templates"
324- 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"
324+ 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 "
325325 for i in ${OLD_TEMPLATES}; do
326326 if [[ -f "${i}" ]]; then
327327 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -729,6 +729,14 @@ pipeline {
729729 }
730730 sh ''' #! /bin/bash
731731 set -e
732+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
733+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
734+ if [ -n "${CI_DOCKERENV}" ]; then
735+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
736+ else
737+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
738+ fi
739+ fi
732740 docker pull ghcr.io/linuxserver/ci:latest
733741 if [ "${MULTIARCH}" == "true" ]; then
734742 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -741,6 +749,7 @@ pipeline {
741749 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
742750 -e TAGS=\" ${CI_TAGS}\" \
743751 -e META_TAG=\" ${META_TAG}\" \
752+ -e RELEASE_TAG=\" latest\" \
744753 -e PORT=\" ${CI_PORT}\" \
745754 -e SSL=\" ${CI_SSL}\" \
746755 -e BASE=\" ${DIST_IMAGE}\" \
@@ -750,6 +759,7 @@ pipeline {
750759 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
751760 -e WEB_AUTH=\" ${CI_AUTH}\" \
752761 -e WEB_PATH=\" ${CI_WEBPATH}\" \
762+ -e NODE_NAME=\" ${NODE_NAME}\" \
753763 -t ghcr.io/linuxserver/ci:latest \
754764 python3 test_build.py'''
755765 }
@@ -1017,17 +1027,45 @@ EOF
10171027 git config --global --unset commit.gpgsign
10181028 '''
10191029 script{
1030+ env. JOB_DATE = sh(
1031+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
1032+ returnStdout : true ). trim()
10201033 if (env. EXIT_STATUS == " ABORTED" ){
10211034 sh ' echo "build aborted"'
1022- }
1023- else if (currentBuild. currentResult == " SUCCESS" ){
1024- 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,\
1025- "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"}],\
1026- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1027- }
1028- else {
1029- 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,\
1030- "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"}],\
1035+ }else {
1036+ if (currentBuild. currentResult == " SUCCESS" ){
1037+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1038+ env. JOB_WEBHOOK_STATUS = ' Success'
1039+ env. JOB_WEBHOOK_COLOUR = 3957028
1040+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1041+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1042+ env. JOB_WEBHOOK_STATUS = ' Success'
1043+ env. JOB_WEBHOOK_COLOUR = 3957028
1044+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1045+ }else {
1046+ env. JOB_WEBHOOK_STATUS = ' Success'
1047+ env. JOB_WEBHOOK_COLOUR = 1681177
1048+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1049+ }
1050+ }else {
1051+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1052+ env. JOB_WEBHOOK_STATUS = ' Failure'
1053+ env. JOB_WEBHOOK_COLOUR = 12669523
1054+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1055+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1056+ env. JOB_WEBHOOK_STATUS = ' Failure'
1057+ env. JOB_WEBHOOK_COLOUR = 12669523
1058+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1059+ }else {
1060+ env. JOB_WEBHOOK_STATUS = ' Failure'
1061+ env. JOB_WEBHOOK_COLOUR = 16711680
1062+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1063+ }
1064+ }
1065+ 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}',\
1066+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
1067+ "timestamp": "'${JOB_DATE}'",\
1068+ "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"}],\
10311069 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
10321070 }
10331071 }
0 commit comments