From 7284c05a08b914315ba288872fadc46fa282a18d Mon Sep 17 00:00:00 2001 From: jamesohara123 Date: Fri, 26 May 2017 15:24:44 +0100 Subject: [PATCH 1/3] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0114607..574d301 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,8 +12,8 @@ pipeline { } environment { //these will be used throughout the Pipeline - DOCKER_HUB_USER = 'beedemo' - DOCKER_CREDENTIAL_ID = 'docker-hub-beedemo' + DOCKER_HUB_USER = 'jamesohara123' + DOCKER_CREDENTIAL_ID = 'docker-joh' //will shorten sh step for frist two stages, but require stage level environment variables to override COMPOSE_FILE = 'docker-compose-test.yml' } From 4ec00b5d564a8f75fcf1ff03087c477dd180984c Mon Sep 17 00:00:00 2001 From: jamesohara123 Date: Fri, 26 May 2017 15:31:48 +0100 Subject: [PATCH 2/3] added slack notifications --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 574d301..09305c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,5 +104,11 @@ pipeline { always { sh "docker-compose -f docker-compose-test-local.yml down" } + success { + slackSend(color: "good", message: "$(env.JOB_NAME} completed successfully, details at ${env.RUN_DISPLAY_URL}") + } + failure { + slackSend(color: "danger", message: "$(env.JOB_NAME} bollocksed, details at ${env.RUN_DISPLAY_URL}") + } } } From 13359afaa25ff445111882be00b0233835bbc36d Mon Sep 17 00:00:00 2001 From: jamesohara123 Date: Fri, 26 May 2017 16:06:11 +0100 Subject: [PATCH 3/3] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09305c8..eacf1a1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -105,10 +105,10 @@ pipeline { sh "docker-compose -f docker-compose-test-local.yml down" } success { - slackSend(color: "good", message: "$(env.JOB_NAME} completed successfully, details at ${env.RUN_DISPLAY_URL}") + slackSend(color: "good", message: "${env.JOB_NAME} completed successfully, details at ${env.RUN_DISPLAY_URL}") } failure { - slackSend(color: "danger", message: "$(env.JOB_NAME} bollocksed, details at ${env.RUN_DISPLAY_URL}") + slackSend(color: "danger", message: "${env.JOB_NAME} bollocksed, details at ${env.RUN_DISPLAY_URL}") } } }