From ae04aff7168fb8c65d62ba68235185148456267f Mon Sep 17 00:00:00 2001 From: huayingnami <45541167+huayingnami@users.noreply.github.com> Date: Wed, 8 Apr 2020 15:46:52 +0200 Subject: [PATCH 1/4] commented out stage code quality and changed agent to host --- build/App.Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/App.Jenkinsfile b/build/App.Jenkinsfile index fd4e7ea..9eafcfd 100644 --- a/build/App.Jenkinsfile +++ b/build/App.Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { - label 'docker' + label 'host' } options { @@ -28,6 +28,7 @@ pipeline { } } + /* stage("Code Quality") { steps { dir("./app") { @@ -43,7 +44,8 @@ pipeline { } } } - + */ + stage("Unit Test") { steps { dir("./app") { From 0bd82c1b83f40eb3c476f2d6131750051ababdc9 Mon Sep 17 00:00:00 2001 From: huayingnami Date: Thu, 9 Apr 2020 18:00:21 +0200 Subject: [PATCH 2/4] changed css style sheet in index.pug --- app/src/views/index.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/views/index.pug b/app/src/views/index.pug index d9af4a9..06f6197 100644 --- a/app/src/views/index.pug +++ b/app/src/views/index.pug @@ -3,7 +3,7 @@ html title!= title link(rel='stylesheet', href='assets/css/main.css') link(rel='stylesheet', href='assets/css/fonts.css') - link(rel='stylesheet', href='assets/css/w3.css') + link(rel='stylesheet', href='https://www.w3schools.com/w3css/4/w3.css') body div(class='bgimg w3-display-container w3-animate-opacity w3-text-white') div(class='w3-display-topleft w3-padding-large w3-xlarge') From a5ea5f015116bb4068704f652ad92efc83d4e066 Mon Sep 17 00:00:00 2001 From: huayingnami Date: Thu, 9 Apr 2020 18:25:18 +0200 Subject: [PATCH 3/4] Revert "changed css style sheet in index.pug" This reverts commit 0bd82c1b83f40eb3c476f2d6131750051ababdc9. --- app/src/views/index.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/views/index.pug b/app/src/views/index.pug index 06f6197..d9af4a9 100644 --- a/app/src/views/index.pug +++ b/app/src/views/index.pug @@ -3,7 +3,7 @@ html title!= title link(rel='stylesheet', href='assets/css/main.css') link(rel='stylesheet', href='assets/css/fonts.css') - link(rel='stylesheet', href='https://www.w3schools.com/w3css/4/w3.css') + link(rel='stylesheet', href='assets/css/w3.css') body div(class='bgimg w3-display-container w3-animate-opacity w3-text-white') div(class='w3-display-topleft w3-padding-large w3-xlarge') From b261f6336c1bb428b5dcc1a6334e46c3905080a6 Mon Sep 17 00:00:00 2001 From: huayingnami Date: Sat, 11 Apr 2020 20:39:12 +0200 Subject: [PATCH 4/4] commented out stage "integration test" --- build/App.Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/App.Jenkinsfile b/build/App.Jenkinsfile index 9eafcfd..c7f7829 100644 --- a/build/App.Jenkinsfile +++ b/build/App.Jenkinsfile @@ -77,7 +77,8 @@ pipeline { } } } - + + /* stage("Integration Test") { steps { script { @@ -95,6 +96,7 @@ pipeline { } } } + */ }