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