@@ -983,52 +983,41 @@ EOF
983983 returnStdout : true ). trim()
984984 if (env. EXIT_STATUS == " ABORTED" ){
985985 sh ' echo "build aborted"'
986- }
987- else if (currentBuild. currentResult == " SUCCESS" ){
988- if (env. GITHUBIMAGE =~ / lspipepr/ ){
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": 3957028,\
990- "footer": {"text" : "PR Build"},\
991- "timestamp": "'${JOB_DATE}'",\
992- "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"}],\
993- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
994- }
995- else if (env. GITHUBIMAGE =~ / lsiodev/ ){
996- 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": 3957028,\
997- "footer": {"text" : "Dev Build"},\
998- "timestamp": "'${JOB_DATE}'",\
999- "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"}],\
1000- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1001- }
1002- else {
1003- 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,\
1004- "footer": {"text" : "Live Build"},\
1005- "timestamp": "'${JOB_DATE}'",\
1006- "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"}],\
1007- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1008- }
1009- }
1010- else {
1011- if (env. GITHUBIMAGE =~ / lspipepr/ ){
1012- 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": 12669523,\
1013- "footer": {"text" : "PR Build"},\
1014- "timestamp": "'${JOB_DATE}'",\
1015- "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"}],\
1016- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1017- }
1018- else if (env. GITHUBIMAGE =~ / lsiodev/ ){
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": 12669523,\
1020- "footer": {"text" : "Dev Build"},\
1021- "timestamp": "'${JOB_DATE}'",\
1022- "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"}],\
1023- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
986+ }else {
987+ if (currentBuild. currentResult == " SUCCESS" ){
988+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
989+ env. JOB_WEBHOOK_STATUS = ' Success'
990+ env. JOB_WEBHOOK_COLOUR = 3957028
991+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
992+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
993+ env. JOB_WEBHOOK_STATUS = ' Success'
994+ env. JOB_WEBHOOK_COLOUR = 3957028
995+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
996+ }else {
997+ env. JOB_WEBHOOK_STATUS = ' Success'
998+ env. JOB_WEBHOOK_COLOUR = 1681177
999+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1000+ }
1001+ }else {
1002+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1003+ env. JOB_WEBHOOK_STATUS = ' Failure'
1004+ env. JOB_WEBHOOK_COLOUR = 12669523
1005+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1006+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1007+ env. JOB_WEBHOOK_STATUS = ' Failure'
1008+ env. JOB_WEBHOOK_COLOUR = 12669523
1009+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1010+ }else {
1011+ env. JOB_WEBHOOK_STATUS = ' Failure'
1012+ env. JOB_WEBHOOK_COLOUR = 16711680
1013+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1014+ }
10241015 }
1025- else {
1026- 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,\
1027- "footer": {"text" : "Live Build"},\
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'": '${JOB_WEBHOOK_COLOUR}',\
1017+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
10281018 "timestamp": "'${JOB_DATE}'",\
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"}],\
1019+ "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"}],\
10301020 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1031- }
10321021 }
10331022 }
10341023 }
0 commit comments