@@ -1032,52 +1032,41 @@ EOF
10321032 returnStdout : true ). trim()
10331033 if (env. EXIT_STATUS == " ABORTED" ){
10341034 sh ' echo "build aborted"'
1035- }
1036- else if (currentBuild. currentResult == " SUCCESS" ){
1037- if (env. GITHUBIMAGE =~ / lspipepr/ ){
1038- 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,\
1039- "footer": {"text" : "PR Build"},\
1040- "timestamp": "'${JOB_DATE}'",\
1041- "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"}],\
1042- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1043- }
1044- else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1045- 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,\
1046- "footer": {"text" : "Dev Build"},\
1047- "timestamp": "'${JOB_DATE}'",\
1048- "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"}],\
1049- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1050- }
1051- else {
1052- 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,\
1053- "footer": {"text" : "Live Build"},\
1054- "timestamp": "'${JOB_DATE}'",\
1055- "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"}],\
1056- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1057- }
1058- }
1059- else {
1060- if (env. GITHUBIMAGE =~ / lspipepr/ ){
1061- 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,\
1062- "footer": {"text" : "PR Build"},\
1063- "timestamp": "'${JOB_DATE}'",\
1064- "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"}],\
1065- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1066- }
1067- else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1068- 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,\
1069- "footer": {"text" : "Dev Build"},\
1070- "timestamp": "'${JOB_DATE}'",\
1071- "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"}],\
1072- "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1035+ }else {
1036+ if (currentBuild. currentResult == " SUCCESS" ){
1037+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1038+ env. JOB_WEBHOOK_STATUS = ' Success'
1039+ env. JOB_WEBHOOK_COLOUR = 3957028
1040+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1041+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1042+ env. JOB_WEBHOOK_STATUS = ' Success'
1043+ env. JOB_WEBHOOK_COLOUR = 3957028
1044+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1045+ }else {
1046+ env. JOB_WEBHOOK_STATUS = ' Success'
1047+ env. JOB_WEBHOOK_COLOUR = 1681177
1048+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1049+ }
1050+ }else {
1051+ if (env. GITHUBIMAGE =~ / lspipepr/ ){
1052+ env. JOB_WEBHOOK_STATUS = ' Failure'
1053+ env. JOB_WEBHOOK_COLOUR = 12669523
1054+ env. JOB_WEBHOOK_FOOTER = ' PR Build'
1055+ }else if (env. GITHUBIMAGE =~ / lsiodev/ ){
1056+ env. JOB_WEBHOOK_STATUS = ' Failure'
1057+ env. JOB_WEBHOOK_COLOUR = 12669523
1058+ env. JOB_WEBHOOK_FOOTER = ' Dev Build'
1059+ }else {
1060+ env. JOB_WEBHOOK_STATUS = ' Failure'
1061+ env. JOB_WEBHOOK_COLOUR = 16711680
1062+ env. JOB_WEBHOOK_FOOTER = ' Live Build'
1063+ }
10731064 }
1074- else {
1075- 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,\
1076- "footer": {"text" : "Live Build"},\
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'": '${JOB_WEBHOOK_COLOUR}',\
1066+ "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
10771067 "timestamp": "'${JOB_DATE}'",\
1078- "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"}],\
1068+ "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"}],\
10791069 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
1080- }
10811070 }
10821071 }
10831072 }
0 commit comments