From 604a0b1fe6aa5fb0d56cb7e4b6fc16e371360cf8 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 11:10:21 -0700 Subject: added Jenkinsfile for jenkins build config --- Jenkinsfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Jenkinsfile (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..806f7356 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,18 @@ +#!/usr/bin/env groovy + +parallel 'centos7': { + node('centos7') { + stage "Checkout Centos 7" + checkout scm + + stage "Build Centos 7" + sh 'make -f make-linux.mk' + } +}, 'android-ndk': { + node('android-ndk') { + stage "Checkout Android NDK" + checkout scm + stage "Build Android NDK" + sh '/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=$WORKSPACE' + } +} -- cgit v1.2.3 From 6cd36edf452e937217a7aa0dffe30beeb539de49 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 11:18:26 -0700 Subject: Update stages --- Jenkinsfile | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 806f7356..e367bc76 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,17 +2,22 @@ parallel 'centos7': { node('centos7') { - stage "Checkout Centos 7" - checkout scm + stage('Checkout Centos 7') { + checkout scm + } - stage "Build Centos 7" - sh 'make -f make-linux.mk' + stage('Build Centos 7') { + sh 'make -f make-linux.mk' + } } }, 'android-ndk': { node('android-ndk') { - stage "Checkout Android NDK" - checkout scm - stage "Build Android NDK" - sh '/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=$WORKSPACE' + stage('Checkout Android NDK') { + checkout scm + } + + stage "Build Android NDK" { + sh '/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=$WORKSPACE' + } } } -- cgit v1.2.3 From 730000539875634c6214d5c4f0888c2e97edc96c Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 11:21:39 -0700 Subject: fixed one more stage syntax for jenkins build --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index e367bc76..28f2b5d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ parallel 'centos7': { checkout scm } - stage "Build Android NDK" { + stage('Build Android NDK') { sh '/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=$WORKSPACE' } } -- cgit v1.2.3 From 5be7374f56dbfcede5d6009bac478e8b85dbfaf4 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 12:40:03 -0700 Subject: added macOS build for jenkins --- Jenkinsfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 28f2b5d7..e97cc4f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,9 +2,7 @@ parallel 'centos7': { node('centos7') { - stage('Checkout Centos 7') { - checkout scm - } + checkout scm stage('Build Centos 7') { sh 'make -f make-linux.mk' @@ -12,12 +10,18 @@ parallel 'centos7': { } }, 'android-ndk': { node('android-ndk') { - stage('Checkout Android NDK') { - checkout scm - } + checkout scm stage('Build Android NDK') { sh '/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=$WORKSPACE' } } +}, 'macOS': { + node('macOS') { + checkout scm + + stage('Build macOS') { + sh 'make -f make-mac.mk' + } + } } -- cgit v1.2.3 From df6d3ca66b00fc67fe5ce09e5e8e4b4a77e6beec Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 12:58:54 -0700 Subject: add stage for building the new macOS UI in Jenkins --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index e97cc4f2..4196d42c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,5 +23,11 @@ parallel 'centos7': { stage('Build macOS') { sh 'make -f make-mac.mk' } + + stage('Build macOS UI') { + dir('$WORKSPACE/macui') { + sh 'xcodebuild -scheme "ZeroTier One" -configuration Debug' + } + } } } -- cgit v1.2.3 From b01c5511975c509e576693b75c59ce9ff7403b92 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 13:04:24 -0700 Subject: fix directory directive in jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 4196d42c..a404fea7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ parallel 'centos7': { } stage('Build macOS UI') { - dir('$WORKSPACE/macui') { + dir('macui') { sh 'xcodebuild -scheme "ZeroTier One" -configuration Debug' } } -- cgit v1.2.3 From af2bdfc421c380b872da5e5ab13d18d9e2dce743 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 13:14:28 -0700 Subject: dir directive appears to create a tmpdir rather than just cd --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index a404fea7..7bbcaa24 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,9 +25,7 @@ parallel 'centos7': { } stage('Build macOS UI') { - dir('macui') { - sh 'xcodebuild -scheme "ZeroTier One" -configuration Debug' - } + sh 'cd macui && xcodebuild -scheme "ZeroTier One" -configuration Debug' } } } -- cgit v1.2.3 From c976b87ac7ce3348ccd1159d31ea293905ba4394 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 13:33:50 -0700 Subject: -scheme -> -target --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 7bbcaa24..b01b6f27 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ parallel 'centos7': { } stage('Build macOS UI') { - sh 'cd macui && xcodebuild -scheme "ZeroTier One" -configuration Debug' + sh 'cd macui && xcodebuild -target "ZeroTier One" -configuration Debug' } } } -- cgit v1.2.3 From 6cb23e706981d4df533c9a06dea9e7befaced29f Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 14:35:31 -0700 Subject: added slack notifications --- Jenkinsfile | 49 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index b01b6f27..528086f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,31 +1,58 @@ #!/usr/bin/env groovy +slackSend "Building ${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUM}" parallel 'centos7': { node('centos7') { - checkout scm + try { + checkout scm - stage('Build Centos 7') { - sh 'make -f make-linux.mk' + stage('Build Centos 7') { + sh 'make -f make-linux.mk' + } + } + catch (err) { + currentBuild.result = "FAILURE" + slackSend color: '#ff0000', message: "${env.JOB_NAME}/${env.BRANCH_NAME} broken on Centos 7 (<${env.BUILD_URL}|Open>)" + + throw err } } }, 'android-ndk': { node('android-ndk') { - checkout scm + try { + checkout scm - stage('Build Android NDK') { - sh '/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=$WORKSPACE' + stage('Build Android NDK') { + sh "/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=${WORKSPACE}" + } + } + catch (err) { + currentBuild.result = "FAILURE" + slackSend color: '#ff0000', message: "${env.JOB_NAME}/${env.BRANCH_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)" + + throw err } } }, 'macOS': { node('macOS') { - checkout scm + try { + checkout scm + + stage('Build macOS') { + sh 'make -f make-mac.mk' + } - stage('Build macOS') { - sh 'make -f make-mac.mk' + stage('Build macOS UI') { + sh 'cd macui && xcodebuild -target "ZeroTier One" -configuration Debug' + } } + catch (err) { + currentBuild.result = "FAILURE" + slackSend color: '#ff0000', message: "${env.JOB_NAME}/${env.BRANCH_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" - stage('Build macOS UI') { - sh 'cd macui && xcodebuild -target "ZeroTier One" -configuration Debug' + throw err } } } + +slackSend "${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUM} Complete (<${env.BUILD_URL}|Show More...>)" \ No newline at end of file -- cgit v1.2.3 From 5c476391da1ceb9015be0b5b4c97ade32830e172 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 14:37:19 -0700 Subject: fixed build number in slack messages --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 528086f6..0520c422 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ #!/usr/bin/env groovy -slackSend "Building ${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUM}" +slackSend "Building ${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUMBER}" parallel 'centos7': { node('centos7') { try { @@ -55,4 +55,4 @@ parallel 'centos7': { } } -slackSend "${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUM} Complete (<${env.BUILD_URL}|Show More...>)" \ No newline at end of file +slackSend "${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" \ No newline at end of file -- cgit v1.2.3 From 1fcedb8d167d64a6c784f5d4a34bd761e63438a6 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 14:38:57 -0700 Subject: fix duplicate branch name in slack --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 0520c422..d4f2e919 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ #!/usr/bin/env groovy -slackSend "Building ${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUMBER}" +slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER}" parallel 'centos7': { node('centos7') { try { @@ -12,7 +12,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME}/${env.BRANCH_NAME} broken on Centos 7 (<${env.BUILD_URL}|Open>)" + slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Centos 7 (<${env.BUILD_URL}|Open>)" throw err } @@ -28,7 +28,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME}/${env.BRANCH_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)" + slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)" throw err } @@ -48,11 +48,11 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME}/${env.BRANCH_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" + slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" throw err } } } -slackSend "${env.JOB_NAME}/${env.BRANCH_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" \ No newline at end of file +slackSend "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" \ No newline at end of file -- cgit v1.2.3 From d2ee37a3e09715748a43ee45909ae6367b863a61 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 14:58:27 -0700 Subject: attempting to add the changelog to the starting build slack message --- Jenkinsfile | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index d4f2e919..55da43ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,9 @@ #!/usr/bin/env groovy -slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER}" +passedBuilds = [] +def changelog = lastSuccessfulBuild(passedBuilds, currentBuild) + +slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n ${changelog}" parallel 'centos7': { node('centos7') { try { @@ -55,4 +58,28 @@ parallel 'centos7': { } } -slackSend "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" \ No newline at end of file +slackSend "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" + +def lastSuccessfulBuild(passedBuilds, build) { + if ((build != null) && (build.result != 'SUCCESS')) { + passedBuilds.add(build) + lastSuccessfulBuild(passedBuilds, build.getPreviousBuild()) + } +} + +@NonCPS +def getChangeLog(passedBuilds) { + def log = "" + for (int x = 0; x < passedBuilds.size(); x++) { + def currentBuild = passedBuilds[x]; + def changeLogSets = currentBuild.rawBuild.changeSets + for (int i = 0; i < changeLogSets.size(); i++) { + def entries = changeLogSets[i].items + for (int j = 0; j < entries.length; j++) { + def entry = entries[j] + log += "* ${entry.msg} by ${entry.author} \n" + } + } + } + return log; +} \ No newline at end of file -- cgit v1.2.3 From 7e7462b39e0ba35ca9ca9ed4a2f7ac6b08565d3c Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 15:01:59 -0700 Subject: attempting #2 --- Jenkinsfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 55da43ef..10e0f321 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,13 @@ #!/usr/bin/env groovy -passedBuilds = [] -def changelog = lastSuccessfulBuild(passedBuilds, currentBuild) +node('master') { + checkout scm + passedBuilds = [] + def changelog = lastSuccessfulBuild(passedBuilds, currentBuild) + + slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n ${changelog}" +} -slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n ${changelog}" parallel 'centos7': { node('centos7') { try { -- cgit v1.2.3 From be543c4039ea13957c2db3653e2d3aa355693c91 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 25 Oct 2016 15:51:30 -0700 Subject: use internal changelog library --- Jenkinsfile | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 10e0f321..449457bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,11 +1,9 @@ #!/usr/bin/env groovy node('master') { - checkout scm - passedBuilds = [] - def changelog = lastSuccessfulBuild(passedBuilds, currentBuild) + def changelog = getChangeLog currentBuild - slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n ${changelog}" + slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n Change Log: \n ${changelog}" } parallel 'centos7': { @@ -63,27 +61,3 @@ parallel 'centos7': { } slackSend "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" - -def lastSuccessfulBuild(passedBuilds, build) { - if ((build != null) && (build.result != 'SUCCESS')) { - passedBuilds.add(build) - lastSuccessfulBuild(passedBuilds, build.getPreviousBuild()) - } -} - -@NonCPS -def getChangeLog(passedBuilds) { - def log = "" - for (int x = 0; x < passedBuilds.size(); x++) { - def currentBuild = passedBuilds[x]; - def changeLogSets = currentBuild.rawBuild.changeSets - for (int i = 0; i < changeLogSets.size(); i++) { - def entries = changeLogSets[i].items - for (int j = 0; j < entries.length; j++) { - def entry = entries[j] - log += "* ${entry.msg} by ${entry.author} \n" - } - } - } - return log; -} \ No newline at end of file -- cgit v1.2.3 From 1afa9e992cf3cc28a554770f095087f0d764e67e Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 27 Oct 2016 14:01:00 -0700 Subject: add color to success output in slack --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 449457bb..5206737e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,4 +60,4 @@ parallel 'centos7': { } } -slackSend "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" +slackSend color: "#00ff00", message: "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" -- cgit v1.2.3 From 231cc11a629885b21017ecf40d3544e87650052f Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 27 Oct 2016 14:28:42 -0700 Subject: Update path to nkd-build --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 5206737e..a72d2bb1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ parallel 'centos7': { checkout scm stage('Build Android NDK') { - sh "/android/android-ndk-r13/ndk-build -C $WORKSPACE/java ZT1=${WORKSPACE}" + sh "/android/android-ndk-r13b/ndk-build -C $WORKSPACE/java ZT1=${WORKSPACE}" } } catch (err) { -- cgit v1.2.3 From cf59362c4aee0b67948b45ec54268ffacff51b05 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 28 Nov 2016 13:06:28 -0800 Subject: add windows build to Jenkinsfile --- Jenkinsfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index a72d2bb1..d1602684 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,6 +58,24 @@ parallel 'centos7': { throw err } } +}, 'windows': { + node('windows') { + try { + checkout scm + + stage('Build Windows') { + bat '''CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64 + +devenv windows\\ZeroTierOne.sln /clean +devenv windows\\ZeroTierOne.sln /build +''' + } + } + catch (err) { + currentBuild.result = "FAILURE" + slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)" + } + } } slackSend color: "#00ff00", message: "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" -- cgit v1.2.3 From 14fcb5867fa9523ac7f7a20670a74a128f7b0546 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 28 Nov 2016 14:57:37 -0800 Subject: rethrow windows build error --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index d1602684..3216c118 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,6 +74,8 @@ devenv windows\\ZeroTierOne.sln /build catch (err) { currentBuild.result = "FAILURE" slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)" + + throw err } } } -- cgit v1.2.3 From 289917e2b33202d40850bc8b1f7ba24788fc43bc Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 28 Nov 2016 15:30:52 -0800 Subject: use msbuild instead of devenv --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 3216c118..74c86249 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,9 +65,8 @@ parallel 'centos7': { stage('Build Windows') { bat '''CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64 - -devenv windows\\ZeroTierOne.sln /clean -devenv windows\\ZeroTierOne.sln /build +git clean -dfx +msbuild windows\\ZeroTierOne.sln ''' } } -- cgit v1.2.3 From 10264cec2f57b6cfb6cd0646be54d7a29d03b75b Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Fri, 30 Jun 2017 13:43:39 -0700 Subject: slackSend -> mattermostSend --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index 74c86249..b3de9bbd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ node('master') { def changelog = getChangeLog currentBuild - slackSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n Change Log: \n ${changelog}" + mattermostSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n Change Log: \n ${changelog}" } parallel 'centos7': { @@ -17,7 +17,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Centos 7 (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Centos 7 (<${env.BUILD_URL}|Open>)" throw err } @@ -33,7 +33,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)" throw err } @@ -53,7 +53,7 @@ parallel 'centos7': { } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)" throw err } @@ -72,11 +72,11 @@ msbuild windows\\ZeroTierOne.sln } catch (err) { currentBuild.result = "FAILURE" - slackSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)" + mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)" throw err } } } -slackSend color: "#00ff00", message: "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" +mattermostSend color: "#00ff00", message: "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)" -- cgit v1.2.3 From 207d6572e0f16dc114d684da6bd1071ba9d5e62c Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Fri, 30 Jun 2017 14:24:40 -0700 Subject: fix for changelist posting to mattermost --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index b3de9bbd..d857614b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,8 @@ #!/usr/bin/env groovy node('master') { + checkout scm + def changelog = getChangeLog currentBuild mattermostSend "Building ${env.JOB_NAME} #${env.BUILD_NUMBER} \n Change Log: \n ${changelog}" -- cgit v1.2.3 From 0f03d4ef51909953f393d683bb2a26096acdd917 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 17 Jul 2017 16:55:00 -0700 Subject: Update Jenkinsfile for new NDK in Jenkins --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Jenkinsfile') diff --git a/Jenkinsfile b/Jenkinsfile index d857614b..e729c334 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ parallel 'centos7': { checkout scm stage('Build Android NDK') { - sh "/android/android-ndk-r13b/ndk-build -C $WORKSPACE/java ZT1=${WORKSPACE}" + sh "/android/android-ndk-r15b/ndk-build -C $WORKSPACE/java ZT1=${WORKSPACE}" } } catch (err) { -- cgit v1.2.3