From 2a2ee971bf7580530ff389953854f575a7a3ae36 Mon Sep 17 00:00:00 2001 From: Sdcxv Date: Fri, 24 Aug 2018 16:57:56 +0800 Subject: [PATCH 1/7] Update Jenkinsfile Setup node --- jenkins/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index cf6ea71f5a..04389345fb 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,6 +1,7 @@ pipeline { agent { docker { + label 'MacNode' image 'node:6-alpine' args '-p 3000:3000' } From 22da8ac6263a05726a6bf0b6d3bc970131581f2d Mon Sep 17 00:00:00 2001 From: Sdcxv Date: Fri, 24 Aug 2018 17:25:27 +0800 Subject: [PATCH 2/7] Update Jenkinsfile Add path --- jenkins/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 04389345fb..89ede5e70d 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -7,6 +7,7 @@ pipeline { } } environment { + Path = '/Users/admin/.nvm/versions/node/v8.11.4/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/admin/Library/Android/sdk/tools:/Users/admin/Library/Android/sdk/platform-tools' CI = 'true' } stages { From 4a0a9d01c7e3fe9d748739cbf60af3a385a35e9a Mon Sep 17 00:00:00 2001 From: Sdcxv Date: Fri, 24 Aug 2018 17:36:16 +0800 Subject: [PATCH 3/7] Update Jenkinsfile add environment --- jenkins/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 89ede5e70d..3b251bbdea 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -9,6 +9,7 @@ pipeline { environment { Path = '/Users/admin/.nvm/versions/node/v8.11.4/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/admin/Library/Android/sdk/tools:/Users/admin/Library/Android/sdk/platform-tools' CI = 'true' + AOEU= sh (returnStdout: true, script: 'echo aoeu').trim() } stages { stage('Build') { From 41e345ad050e936e82825507a3f71f54eb7c66d3 Mon Sep 17 00:00:00 2001 From: Sdcxv Date: Fri, 24 Aug 2018 17:43:16 +0800 Subject: [PATCH 4/7] Update Jenkinsfile --- jenkins/Jenkinsfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 3b251bbdea..d9abed7489 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,10 +1,10 @@ pipeline { agent { - docker { label 'MacNode' - image 'node:6-alpine' - args '-p 3000:3000' - } + // docker { + // image 'node:6-alpine' + // args '-p 3000:3000' + //} } environment { Path = '/Users/admin/.nvm/versions/node/v8.11.4/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/admin/Library/Android/sdk/tools:/Users/admin/Library/Android/sdk/platform-tools' @@ -12,6 +12,11 @@ pipeline { AOEU= sh (returnStdout: true, script: 'echo aoeu').trim() } stages { + stage('Build') { + steps { + sh 'printenv' + } + } stage('Build') { steps { sh 'npm install' From 977003fee26d362e6e385cc9a22f8851e3860ac5 Mon Sep 17 00:00:00 2001 From: Sdcxv Date: Fri, 24 Aug 2018 17:44:26 +0800 Subject: [PATCH 5/7] Update Jenkinsfile --- jenkins/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index d9abed7489..a56721ab34 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -12,9 +12,9 @@ pipeline { AOEU= sh (returnStdout: true, script: 'echo aoeu').trim() } stages { - stage('Build') { + stage('env') { steps { - sh 'printenv' + sh 'env' } } stage('Build') { From 329ddfe3e33f18e712d1d1c2ba751bee0a6d4aeb Mon Sep 17 00:00:00 2001 From: Sdcxv Date: Fri, 24 Aug 2018 17:52:05 +0800 Subject: [PATCH 6/7] Update Jenkinsfile --- jenkins/Jenkinsfile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index a56721ab34..9a65c085ab 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,22 +1,16 @@ pipeline { agent { + docker { + image 'node:6-alpine' + args '-p 3000:3000' label 'MacNode' - // docker { - // image 'node:6-alpine' - // args '-p 3000:3000' - //} + } } environment { Path = '/Users/admin/.nvm/versions/node/v8.11.4/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/admin/Library/Android/sdk/tools:/Users/admin/Library/Android/sdk/platform-tools' CI = 'true' - AOEU= sh (returnStdout: true, script: 'echo aoeu').trim() } stages { - stage('env') { - steps { - sh 'env' - } - } stage('Build') { steps { sh 'npm install' From 3be515a7f8c8e307015b16004360ec05b2258097 Mon Sep 17 00:00:00 2001 From: Sdcxv Date: Fri, 24 Aug 2018 18:17:28 +0800 Subject: [PATCH 7/7] Update Jenkinsfile Change to LinuxNode --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 9a65c085ab..11e691d40b 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { docker { image 'node:6-alpine' args '-p 3000:3000' - label 'MacNode' + label 'LinuxNode' } } environment {