@@ -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}" '''
@@ -315,7 +315,7 @@ pipeline {
315315 echo "Jenkinsfile is up to date."
316316 fi
317317 echo "Starting Stage 2 - Delete old templates"
318- 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"
318+ 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 "
319319 for i in ${OLD_TEMPLATES}; do
320320 if [[ -f "${i}" ]]; then
321321 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -689,6 +689,14 @@ pipeline {
689689 }
690690 sh ''' #! /bin/bash
691691 set -e
692+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
693+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
694+ if [ -n "${CI_DOCKERENV}" ]; then
695+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
696+ else
697+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
698+ fi
699+ fi
692700 docker pull ghcr.io/linuxserver/ci:latest
693701 if [ "${MULTIARCH}" == "true" ]; then
694702 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -701,6 +709,7 @@ pipeline {
701709 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
702710 -e TAGS=\" ${CI_TAGS}\" \
703711 -e META_TAG=\" ${META_TAG}\" \
712+ -e RELEASE_TAG=\" latest\" \
704713 -e PORT=\" ${CI_PORT}\" \
705714 -e SSL=\" ${CI_SSL}\" \
706715 -e BASE=\" ${DIST_IMAGE}\" \
@@ -710,6 +719,7 @@ pipeline {
710719 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
711720 -e WEB_AUTH=\" ${CI_AUTH}\" \
712721 -e WEB_PATH=\" ${CI_WEBPATH}\" \
722+ -e NODE_NAME=\" ${NODE_NAME}\" \
713723 -t ghcr.io/linuxserver/ci:latest \
714724 python3 test_build.py'''
715725 }
@@ -977,17 +987,45 @@ EOF
977987 git config --global --unset commit.gpgsign
978988 '''
979989 script{
990+ env. JOB_DATE = sh(
991+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
992+ returnStdout : true ). trim()
980993 if (env. EXIT_STATUS == " ABORTED" ){
981994 sh ' echo "build aborted"'
982- }
983- else if (currentBuild. currentResult == " SUCCESS" ){
984- 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,\
985- "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"}],\
986- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
987- }
988- else {
989- 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,\
990- "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"}],\
995+ }else {
996+ if (currentBuild. currentResult == " SUCCESS" ){
997+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
998+ env. JOB_WEBHOOK_STATUS = ' Success'
999+ env. JOB_WEBHOOK_COLOUR = 3957028
1000+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1001+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1002+ env. JOB_WEBHOOK_STATUS = ' Success'
1003+ env. JOB_WEBHOOK_COLOUR = 3957028
1004+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1005+ }else {
1006+ env. JOB_WEBHOOK_STATUS = ' Success'
1007+ env. JOB_WEBHOOK_COLOUR = 1681177
1008+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1009+ }
1010+ }else {
1011+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1012+ env. JOB_WEBHOOK_STATUS = ' Failure'
1013+ env. JOB_WEBHOOK_COLOUR = 12669523
1014+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1015+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1016+ env. JOB_WEBHOOK_STATUS = ' Failure'
1017+ env. JOB_WEBHOOK_COLOUR = 12669523
1018+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1019+ }else {
1020+ env. JOB_WEBHOOK_STATUS = ' Failure'
1021+ env. JOB_WEBHOOK_COLOUR = 16711680
1022+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1023+ }
1024+ }
1025+ 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}',\
1026+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
1027+ "timestamp": "'${JOB_DATE}'",\
1028+ "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"}],\
9911029 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
9921030 }
9931031 }
0 commit comments