@@ -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 ./ root/donate.txt'
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 ./root/donate.txt'
8787 }
8888 sh ''' #! /bin/bash
8989 echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -320,7 +320,7 @@ pipeline {
320320 echo "Jenkinsfile is up to date."
321321 fi
322322 echo "Starting Stage 2 - Delete old templates"
323- 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"
323+ 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 "
324324 for i in ${OLD_TEMPLATES}; do
325325 if [[ -f "${i}" ]]; then
326326 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -728,6 +728,14 @@ pipeline {
728728 }
729729 sh ''' #! /bin/bash
730730 set -e
731+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
732+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
733+ if [ -n "${CI_DOCKERENV}" ]; then
734+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
735+ else
736+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
737+ fi
738+ fi
731739 docker pull ghcr.io/linuxserver/ci:latest
732740 if [ "${MULTIARCH}" == "true" ]; then
733741 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -740,6 +748,7 @@ pipeline {
740748 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
741749 -e TAGS=\" ${CI_TAGS}\" \
742750 -e META_TAG=\" ${META_TAG}\" \
751+ -e RELEASE_TAG=\" development\" \
743752 -e PORT=\" ${CI_PORT}\" \
744753 -e SSL=\" ${CI_SSL}\" \
745754 -e BASE=\" ${DIST_IMAGE}\" \
@@ -749,6 +758,7 @@ pipeline {
749758 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
750759 -e WEB_AUTH=\" ${CI_AUTH}\" \
751760 -e WEB_PATH=\" ${CI_WEBPATH}\" \
761+ -e NODE_NAME=\" ${NODE_NAME}\" \
752762 -t ghcr.io/linuxserver/ci:latest \
753763 python3 test_build.py'''
754764 }
@@ -1016,17 +1026,45 @@ EOF
10161026 git config --global --unset commit.gpgsign
10171027 '''
10181028 script{
1029+ env. JOB_DATE = sh(
1030+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
1031+ returnStdout : true ). trim()
10191032 if (env. EXIT_STATUS == " ABORTED" ){
10201033 sh ' echo "build aborted"'
1021- }
1022- else if (currentBuild. currentResult == " SUCCESS" ){
1023- 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,\
1024- "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"}],\
1025- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1026- }
1027- else {
1028- 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,\
1029- "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"}],\
1034+ }else {
1035+ if (currentBuild. currentResult == " SUCCESS" ){
1036+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1037+ env. JOB_WEBHOOK_STATUS = ' Success'
1038+ env. JOB_WEBHOOK_COLOUR = 3957028
1039+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1040+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1041+ env. JOB_WEBHOOK_STATUS = ' Success'
1042+ env. JOB_WEBHOOK_COLOUR = 3957028
1043+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1044+ }else {
1045+ env. JOB_WEBHOOK_STATUS = ' Success'
1046+ env. JOB_WEBHOOK_COLOUR = 1681177
1047+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1048+ }
1049+ }else {
1050+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1051+ env. JOB_WEBHOOK_STATUS = ' Failure'
1052+ env. JOB_WEBHOOK_COLOUR = 12669523
1053+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1054+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1055+ env. JOB_WEBHOOK_STATUS = ' Failure'
1056+ env. JOB_WEBHOOK_COLOUR = 12669523
1057+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1058+ }else {
1059+ env. JOB_WEBHOOK_STATUS = ' Failure'
1060+ env. JOB_WEBHOOK_COLOUR = 16711680
1061+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1062+ }
1063+ }
1064+ 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}',\
1065+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
1066+ "timestamp": "'${JOB_DATE}'",\
1067+ "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"}],\
10301068 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
10311069 }
10321070 }
0 commit comments