@@ -1022,52 +1022,41 @@ EOF
10221022 returnStdout : true ). trim()
10231023 if (env. EXIT_STATUS == " ABORTED" ){
10241024 sh ' echo "build aborted"'
1025- }
1026- else if (currentBuild. currentResult == " SUCCESS" ){
1027- if (env. GITHUBIMAGE =~ / lspipepr/ ){
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": 3957028,\
1029- "footer": {"text" : "PR Build"},\
1030- "timestamp": "'${JOB_DATE}'",\
1031- "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"}],\
1032- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1033- }
1034- else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1035- 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,\
1036- "footer": {"text" : "Dev Build"},\
1037- "timestamp": "'${JOB_DATE}'",\
1038- "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"}],\
1039- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1040- }
1041- else {
1042- 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,\
1043- "footer": {"text" : "Live Build"},\
1044- "timestamp": "'${JOB_DATE}'",\
1045- "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"}],\
1046- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1047- }
1048- }
1049- else {
1050- if (env. GITHUBIMAGE =~ / lspipepr/ ){
1051- 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,\
1052- "footer": {"text" : "PR Build"},\
1053- "timestamp": "'${JOB_DATE}'",\
1054- "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"}],\
1055- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1056- }
1057- else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1058- 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,\
1059- "footer": {"text" : "Dev Build"},\
1060- "timestamp": "'${JOB_DATE}'",\
1061- "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"}],\
1062- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1025+ }else {
1026+ if (currentBuild. currentResult == " SUCCESS" ){
1027+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1028+ env. JOB_WEBHOOK_STATUS = ' Success'
1029+ env. JOB_WEBHOOK_COLOUR = 3957028
1030+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1031+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1032+ env. JOB_WEBHOOK_STATUS = ' Success'
1033+ env. JOB_WEBHOOK_COLOUR = 3957028
1034+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1035+ }else {
1036+ env. JOB_WEBHOOK_STATUS = ' Success'
1037+ env. JOB_WEBHOOK_COLOUR = 1681177
1038+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1039+ }
1040+ }else {
1041+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1042+ env. JOB_WEBHOOK_STATUS = ' Failure'
1043+ env. JOB_WEBHOOK_COLOUR = 12669523
1044+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1045+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1046+ env. JOB_WEBHOOK_STATUS = ' Failure'
1047+ env. JOB_WEBHOOK_COLOUR = 12669523
1048+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1049+ }else {
1050+ env. JOB_WEBHOOK_STATUS = ' Failure'
1051+ env. JOB_WEBHOOK_COLOUR = 16711680
1052+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1053+ }
10631054 }
1064- else {
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": 16711680,\
1066- "footer": {"text" : "Live Build"},\
1055+ 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}',\
1056+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
10671057 "timestamp": "'${JOB_DATE}'",\
1068- "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"}],\
1058+ "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"}],\
10691059 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1070- }
10711060 }
10721061 }
10731062 }
0 commit comments