From 7ceb6b12dd891ae0b6afab3656b7201ec8d7631f Mon Sep 17 00:00:00 2001 From: 10thmagnitude-tkucia <32137569+10thmagnitude-tkucia@users.noreply.github.com> Date: Thu, 11 Jul 2019 14:53:46 -0500 Subject: [PATCH 1/5] Create Jenkinsfile.txt --- Jenkinsfile.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile.txt diff --git a/Jenkinsfile.txt b/Jenkinsfile.txt new file mode 100644 index 0000000000..2b6476817e --- /dev/null +++ b/Jenkinsfile.txt @@ -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 b6458c374c1ec736feb98cd1c12bc7262540a367 Mon Sep 17 00:00:00 2001 From: 10thmagnitude-tkucia <32137569+10thmagnitude-tkucia@users.noreply.github.com> Date: Thu, 11 Jul 2019 15:05:07 -0500 Subject: [PATCH 2/5] Renamed Jenkinsfile --- Jenkinsfile.txt => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Jenkinsfile.txt => Jenkinsfile (100%) diff --git a/Jenkinsfile.txt b/Jenkinsfile similarity index 100% rename from Jenkinsfile.txt rename to Jenkinsfile From 36a2c136b969fe2739c2d833618e683ca4ba1bc3 Mon Sep 17 00:00:00 2001 From: 10thmagnitude-tkucia <32137569+10thmagnitude-tkucia@users.noreply.github.com> Date: Thu, 11 Jul 2019 15:28:53 -0500 Subject: [PATCH 3/5] Add 'Test' Server --- jenkins/scripts/test.sh | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/test.sh b/jenkins/scripts/test.sh index 360d00b94e..6789ebcef0 100755 --- a/jenkins/scripts/test.sh +++ b/jenkins/scripts/test.sh @@ -10,7 +10,7 @@ echo 'installing this dependency, it would typically be done so using this' echo 'flag. For a comprehensive explanation about "devDependencies", see' echo 'https://stackoverflow.com/questions/18875674/whats-the-difference-between-dependencies-devdependencies-and-peerdependencies.' set -x -# npm install --save-dev cross-env +npm install --save-dev cross-env set +x echo 'The following "npm" command tests that your simple Node.js/React' diff --git a/package.json b/package.json index 53720bdbbb..e21781beec 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "scripts": { "start": "react-scripts start", "build": "react-scripts build", - "test": "react-scripts test --env=jsdom", + "test": "cross-env CI=true react-scripts test --env=jsdom", "eject": "react-scripts eject" } } \ No newline at end of file From 708e0727361d39f328bc9c95634ccd6f0e5a52c4 Mon Sep 17 00:00:00 2001 From: 10thmagnitude-tkucia <32137569+10thmagnitude-tkucia@users.noreply.github.com> Date: Thu, 11 Jul 2019 15:55:34 -0500 Subject: [PATCH 4/5] Added 'Test' Stage --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2b6476817e..25762016c3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,12 +4,20 @@ pipeline { 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' + } } } } \ No newline at end of file From d792398a3efe388d90bebc962fa9fac6898c47ec Mon Sep 17 00:00:00 2001 From: 10thmagnitude-tkucia <32137569+10thmagnitude-tkucia@users.noreply.github.com> Date: Thu, 11 Jul 2019 16:34:48 -0500 Subject: [PATCH 5/5] Add 'Deliver' stage --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 25762016c3..0237d89ede 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,13 @@ pipeline { 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' + } } } } \ No newline at end of file