From c08dcf9a4e05f4a4eeccb0c30ef0dbc893d4681e Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Wed, 26 May 2021 15:27:15 +0200 Subject: [PATCH 01/15] add Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..2b6476817e --- /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' + } + } + } +} \ No newline at end of file From e2cee72f2cb2a8e612f9e40d7af9f379841fa0dd Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Wed, 26 May 2021 15:47:38 +0200 Subject: [PATCH 02/15] changeJenkinsfile --- Jenkinsfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b6476817e..cdc2e3450a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,10 @@ pipeline { docker { image 'node:6-alpine' args '-p 3000:3000' - } + } + } + environment { + CI = 'true' } stages { stage('Build') { @@ -11,5 +14,10 @@ pipeline { sh 'npm install' } } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } } } \ No newline at end of file From 004ac3240d921fa837ce30983ab522d0803e42db Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Wed, 26 May 2021 16:19:22 +0200 Subject: [PATCH 03/15] changeJenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cdc2e3450a..1503c64c9b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { docker { - image 'node:6-alpine' + image 'node:16.2.0-alpine' args '-p 3000:3000' } } From 7f2521e188d21420151d08c4133b49c1384da599 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Wed, 26 May 2021 16:21:19 +0200 Subject: [PATCH 04/15] change setting --- Jenkinsfile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1503c64c9b..721d36ad15 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,17 +1,17 @@ pipeline { agent { docker { - image 'node:16.2.0-alpine' - args '-p 3000:3000' - } + image 'node:6-alpine' + args '-p 3000:3000' + } } - environment { + environment { CI = 'true' } stages { - stage('Build') { + stage('Build') { steps { - sh 'npm install' + sh 'npm install' } } stage('Test') { @@ -19,5 +19,12 @@ pipeline { sh './jenkins/scripts/test.sh' } } + stage('Deliver') { + steps { + sh './jenkins/scripts/deliver.sh' + input message: 'Finished using the web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' + } + } } } \ No newline at end of file From 98634552f081385f66bee4e48d38b670edcd74f2 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Wed, 26 May 2021 16:35:53 +0200 Subject: [PATCH 05/15] change setting --- Jenkinsfile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 721d36ad15..476f46ddb8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,12 +1,12 @@ pipeline { agent { docker { - image 'node:6-alpine' + image 'node:lts-buster-slim' args '-p 3000:3000' } } - environment { - CI = 'true' + environment { + CI = 'true' } stages { stage('Build') { @@ -14,16 +14,9 @@ pipeline { sh 'npm install' } } - stage('Test') { + stage('Test') { steps { - sh './jenkins/scripts/test.sh' - } - } - 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/test.sh' } } } From 3f5f7d2fd34d02c3a5bb6e43dd6edd156a669301 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Wed, 26 May 2021 16:40:37 +0200 Subject: [PATCH 06/15] test git hook --- Jenkinsfile | 15 +++++++++++---- src/App.js | 9 +++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 476f46ddb8..e68ea7b574 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,8 +5,8 @@ pipeline { args '-p 3000:3000' } } - environment { - CI = 'true' + environment { + CI = 'true' } stages { stage('Build') { @@ -14,9 +14,16 @@ pipeline { sh 'npm install' } } - stage('Test') { + stage('Test') { steps { - sh './jenkins/scripts/test.sh' + sh './jenkins/scripts/test.sh' + } + } + stage('Deliver') { + steps { + sh './jenkins/scripts/deliver.sh' + input message: 'Finished using the web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' } } } diff --git a/src/App.js b/src/App.js index 203067e4d7..b8f4965b85 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,6 @@ -import React, { Component } from 'react'; -import logo from './logo.svg'; -import './App.css'; +import React, { Component } from "react"; +import logo from "./logo.svg"; +import "./App.css"; class App extends Component { render() { @@ -11,7 +11,8 @@ class App extends Component {

Welcome to React

- To get started, edit src/App.js and save to reload. + To get started, edit src/App.js and save to reload. I'm + comming!

); From e4972380136e10bd25044faa4ee8c036eeabadcb Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 27 May 2021 12:04:24 +0200 Subject: [PATCH 07/15] change text --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index b8f4965b85..db66552a90 100644 --- a/src/App.js +++ b/src/App.js @@ -12,7 +12,7 @@ class App extends Component {

To get started, edit src/App.js and save to reload. I'm - comming! + production!

); From 3d308f4e3b4e609c586c3ec38594e7ca6d5904b2 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 27 May 2021 12:06:09 +0200 Subject: [PATCH 08/15] change text --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index db66552a90..a06fc7c691 100644 --- a/src/App.js +++ b/src/App.js @@ -12,7 +12,7 @@ class App extends Component {

To get started, edit src/App.js and save to reload. I'm - production! + production!!

); From 54d0b6ed0551d38a3e80778476335cbd209c64b1 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 27 May 2021 12:09:59 +0200 Subject: [PATCH 09/15] change text --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index b8f4965b85..1bdd056926 100644 --- a/src/App.js +++ b/src/App.js @@ -12,7 +12,7 @@ class App extends Component {

To get started, edit src/App.js and save to reload. I'm - comming! + development!

); From a15fc4a55e5ab9955a29279ec9d3ce36cf7c337e Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 27 May 2021 15:18:19 +0200 Subject: [PATCH 10/15] change agent --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e68ea7b574..bab3d33b21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - docker { - image 'node:lts-buster-slim' - args '-p 3000:3000' - } - } + agent any environment { CI = 'true' } From 8f7be0d22f0109ec811ab71bcb1156ab17139ea5 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 27 May 2021 15:25:35 +0200 Subject: [PATCH 11/15] change agent --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index bab3d33b21..1fd7fb601e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,6 @@ pipeline { agent any + tools {nodejs "node"} environment { CI = 'true' } From 6f6e7fefd0ec8d7634661713907f3848f252c28c Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 27 May 2021 15:33:34 +0200 Subject: [PATCH 12/15] use any agent --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1fd7fb601e..bab3d33b21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,5 @@ pipeline { agent any - tools {nodejs "node"} environment { CI = 'true' } From dc5aef62ca4f7274eb81258f9fd6018d22266703 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Thu, 27 May 2021 17:04:01 +0200 Subject: [PATCH 13/15] change anent --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e68ea7b574..bab3d33b21 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - docker { - image 'node:lts-buster-slim' - args '-p 3000:3000' - } - } + agent any environment { CI = 'true' } From 77cbf7951bebce33dde172a6d68e30109eecf337 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Fri, 28 May 2021 09:29:18 +0200 Subject: [PATCH 14/15] Update App.js --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index a06fc7c691..aaaff96287 100644 --- a/src/App.js +++ b/src/App.js @@ -12,7 +12,7 @@ class App extends Component {

To get started, edit src/App.js and save to reload. I'm - production!! + production!! test hook!!

); From 6735213770fc1705c0d084c15db4ec0cba9b0e70 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Fri, 28 May 2021 10:48:50 +0200 Subject: [PATCH 15/15] Update Jenkinsfile --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bab3d33b21..4f077fed53 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,9 +17,7 @@ pipeline { stage('Deliver') { steps { sh './jenkins/scripts/deliver.sh' - input message: 'Finished using the web site? (Click "Proceed" to continue)' - sh './jenkins/scripts/kill.sh' } } } -} \ No newline at end of file +}