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