@@ -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}" '''
@@ -309,7 +309,7 @@ pipeline {
309309 echo "Jenkinsfile is up to date."
310310 fi
311311 echo "Starting Stage 2 - Delete old templates"
312- 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"
312+ 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 "
313313 for i in ${OLD_TEMPLATES}; do
314314 if [[ -f "${i}" ]]; then
315315 TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -683,6 +683,14 @@ pipeline {
683683 }
684684 sh ''' #! /bin/bash
685685 set -e
686+ if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
687+ echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
688+ if [ -n "${CI_DOCKERENV}" ]; then
689+ CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
690+ else
691+ CI_DOCKERENV="LSIO_FIRST_PARTY=true"
692+ fi
693+ fi
686694 docker pull ghcr.io/linuxserver/ci:latest
687695 if [ "${MULTIARCH}" == "true" ]; then
688696 docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
@@ -695,6 +703,7 @@ pipeline {
695703 -e DOCKER_LOGS_TIMEOUT=\" ${CI_DELAY}\" \
696704 -e TAGS=\" ${CI_TAGS}\" \
697705 -e META_TAG=\" ${META_TAG}\" \
706+ -e RELEASE_TAG=\" latest\" \
698707 -e PORT=\" ${CI_PORT}\" \
699708 -e SSL=\" ${CI_SSL}\" \
700709 -e BASE=\" ${DIST_IMAGE}\" \
@@ -704,6 +713,7 @@ pipeline {
704713 -e WEB_SCREENSHOT=\" ${CI_WEB}\" \
705714 -e WEB_AUTH=\" ${CI_AUTH}\" \
706715 -e WEB_PATH=\" ${CI_WEBPATH}\" \
716+ -e NODE_NAME=\" ${NODE_NAME}\" \
707717 -t ghcr.io/linuxserver/ci:latest \
708718 python3 test_build.py'''
709719 }
@@ -971,17 +981,45 @@ EOF
971981 git config --global --unset commit.gpgsign
972982 '''
973983 script{
984+ env. JOB_DATE = sh(
985+ script : ''' date '+%Y-%m-%dT%H:%M:%S%:z' ''' ,
986+ returnStdout : true ). trim()
974987 if (env. EXIT_STATUS == " ABORTED" ){
975988 sh ' echo "build aborted"'
976- }
977- else if (currentBuild. currentResult == " SUCCESS" ){
978- 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,\
979- "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"}],\
980- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
981- }
982- else {
983- 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,\
984- "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"}],\
989+ }else {
990+ if (currentBuild. currentResult == " SUCCESS" ){
991+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
992+ env. JOB_WEBHOOK_STATUS = ' Success'
993+ env. JOB_WEBHOOK_COLOUR = 3957028
994+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
995+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
996+ env. JOB_WEBHOOK_STATUS = ' Success'
997+ env. JOB_WEBHOOK_COLOUR = 3957028
998+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
999+ }else {
1000+ env. JOB_WEBHOOK_STATUS = ' Success'
1001+ env. JOB_WEBHOOK_COLOUR = 1681177
1002+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1003+ }
1004+ }else {
1005+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1006+ env. JOB_WEBHOOK_STATUS = ' Failure'
1007+ env. JOB_WEBHOOK_COLOUR = 12669523
1008+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1009+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1010+ env. JOB_WEBHOOK_STATUS = ' Failure'
1011+ env. JOB_WEBHOOK_COLOUR = 12669523
1012+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1013+ }else {
1014+ env. JOB_WEBHOOK_STATUS = ' Failure'
1015+ env. JOB_WEBHOOK_COLOUR = 16711680
1016+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1017+ }
1018+ }
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'": '${JOB_WEBHOOK_COLOUR}',\
1020+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
1021+ "timestamp": "'${JOB_DATE}'",\
1022+ "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"}],\
9851023 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
9861024 }
9871025 }
0 commit comments