From dfbf25929aab5b4fa3a7b6395951d01ae6120eec Mon Sep 17 00:00:00 2001 From: hyjqdy Date: Sun, 1 Nov 2020 19:27:03 +0800 Subject: [PATCH 1/4] Add initial Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..14f0b741ab --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent { + docker { + image 'node:6-alpine' + args '-p 3000:3000' + } + } + stages { + stage('Build') { + steps { + sh 'npm install' + } + } + } +} From 6ae76e5979e96dc20fe092604ea593f2b454ffb9 Mon Sep 17 00:00:00 2001 From: hyjqdy Date: Sun, 1 Nov 2020 19:27:03 +0800 Subject: [PATCH 2/4] Add initial Jenkinsfile --- Jenkinsfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..57882cf2c2 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,23 @@ +pipeline { + agent { + docker { + image 'node:6-alpine' + args '-p 3000:3000' + } + } + environment { + CI = 'true' + } + stages { + stage('Build') { + steps { + sh 'npm install' + } + } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } + } +} From e9a7330b3d5c62cbe557cd57933baaa40a5e69af Mon Sep 17 00:00:00 2001 From: hyjqdy Date: Sun, 1 Nov 2020 20:15:33 +0800 Subject: [PATCH 3/4] Fix Jenkins error --- Jenkinsfile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a06008312f..df8223fdac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,8 +5,8 @@ pipeline { args '-p 3000:3000' } } - environment { - CI = 'true' + environment { + CI = 'true' } stages { stage('Build') { @@ -14,18 +14,17 @@ pipeline { sh 'npm install' } } - stage('Test') { + stage('Test') { steps { - sh './jenkins/scripts/test.sh' + sh './jenkins/scripts/test.sh' } } - } -stage('Deliver') { + stage('Deliver') { steps { - sh './jenkins/scripts/deliver.sh' - input message: 'Finished using the web site? (Click "Proceed" to continue)' - sh './jenkins/scripts/kill.sh' + sh './jenkins/scripts/deliver.sh' + input message: 'Finished using the web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' } } + } } - From 6b93d5bbf921eb730e01dd279fa03124d638b24b Mon Sep 17 00:00:00 2001 From: hyjqdy Date: Sun, 1 Nov 2020 20:21:26 +0800 Subject: [PATCH 4/4] Remove useless files --- Jenkinsfile_BACKUP_77472 | 34 ---------------------------------- Jenkinsfile_BACKUP_77570 | 34 ---------------------------------- Jenkinsfile_BASE_77472 | 0 Jenkinsfile_BASE_77570 | 0 Jenkinsfile_LOCAL_77472 | 23 ----------------------- Jenkinsfile_LOCAL_77570 | 23 ----------------------- Jenkinsfile_REMOTE_77472 | 15 --------------- Jenkinsfile_REMOTE_77570 | 15 --------------- 8 files changed, 144 deletions(-) delete mode 100644 Jenkinsfile_BACKUP_77472 delete mode 100644 Jenkinsfile_BACKUP_77570 delete mode 100644 Jenkinsfile_BASE_77472 delete mode 100644 Jenkinsfile_BASE_77570 delete mode 100644 Jenkinsfile_LOCAL_77472 delete mode 100644 Jenkinsfile_LOCAL_77570 delete mode 100644 Jenkinsfile_REMOTE_77472 delete mode 100644 Jenkinsfile_REMOTE_77570 diff --git a/Jenkinsfile_BACKUP_77472 b/Jenkinsfile_BACKUP_77472 deleted file mode 100644 index c8620b024d..0000000000 --- a/Jenkinsfile_BACKUP_77472 +++ /dev/null @@ -1,34 +0,0 @@ -pipeline { - agent { - docker { -<<<<<<< HEAD - image 'node:6-alpine' - args '-p 3000:3000' - } - } - environment { - CI = 'true' - } - stages { - stage('Build') { - steps { - sh 'npm install' - } - } - stage('Test') { - steps { - sh './jenkins/scripts/test.sh' -======= - image 'node:6-alpine' - args '-p 3000:3000' - } - } - stages { - stage('Build') { - steps { - sh 'npm install' ->>>>>>> dfbf25929aab5b4fa3a7b6395951d01ae6120eec - } - } - } -} diff --git a/Jenkinsfile_BACKUP_77570 b/Jenkinsfile_BACKUP_77570 deleted file mode 100644 index c8620b024d..0000000000 --- a/Jenkinsfile_BACKUP_77570 +++ /dev/null @@ -1,34 +0,0 @@ -pipeline { - agent { - docker { -<<<<<<< HEAD - image 'node:6-alpine' - args '-p 3000:3000' - } - } - environment { - CI = 'true' - } - stages { - stage('Build') { - steps { - sh 'npm install' - } - } - stage('Test') { - steps { - sh './jenkins/scripts/test.sh' -======= - image 'node:6-alpine' - args '-p 3000:3000' - } - } - stages { - stage('Build') { - steps { - sh 'npm install' ->>>>>>> dfbf25929aab5b4fa3a7b6395951d01ae6120eec - } - } - } -} diff --git a/Jenkinsfile_BASE_77472 b/Jenkinsfile_BASE_77472 deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Jenkinsfile_BASE_77570 b/Jenkinsfile_BASE_77570 deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Jenkinsfile_LOCAL_77472 b/Jenkinsfile_LOCAL_77472 deleted file mode 100644 index 57882cf2c2..0000000000 --- a/Jenkinsfile_LOCAL_77472 +++ /dev/null @@ -1,23 +0,0 @@ -pipeline { - agent { - docker { - image 'node:6-alpine' - args '-p 3000:3000' - } - } - environment { - CI = 'true' - } - stages { - stage('Build') { - steps { - sh 'npm install' - } - } - stage('Test') { - steps { - sh './jenkins/scripts/test.sh' - } - } - } -} diff --git a/Jenkinsfile_LOCAL_77570 b/Jenkinsfile_LOCAL_77570 deleted file mode 100644 index 57882cf2c2..0000000000 --- a/Jenkinsfile_LOCAL_77570 +++ /dev/null @@ -1,23 +0,0 @@ -pipeline { - agent { - docker { - image 'node:6-alpine' - args '-p 3000:3000' - } - } - environment { - CI = 'true' - } - stages { - stage('Build') { - steps { - sh 'npm install' - } - } - stage('Test') { - steps { - sh './jenkins/scripts/test.sh' - } - } - } -} diff --git a/Jenkinsfile_REMOTE_77472 b/Jenkinsfile_REMOTE_77472 deleted file mode 100644 index 14f0b741ab..0000000000 --- a/Jenkinsfile_REMOTE_77472 +++ /dev/null @@ -1,15 +0,0 @@ -pipeline { - agent { - docker { - image 'node:6-alpine' - args '-p 3000:3000' - } - } - stages { - stage('Build') { - steps { - sh 'npm install' - } - } - } -} diff --git a/Jenkinsfile_REMOTE_77570 b/Jenkinsfile_REMOTE_77570 deleted file mode 100644 index 14f0b741ab..0000000000 --- a/Jenkinsfile_REMOTE_77570 +++ /dev/null @@ -1,15 +0,0 @@ -pipeline { - agent { - docker { - image 'node:6-alpine' - args '-p 3000:3000' - } - } - stages { - stage('Build') { - steps { - sh 'npm install' - } - } - } -}