From 643da2c7a1411e9ed8afd288cb28d4ec0e9224cc Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 19 Sep 2019 15:56:24 -0700 Subject: [PATCH 1/4] SHIBUI-1505 Commented out the integratioTest / Selenium section. --- Jenkinsfile | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d19cae2ac..bde811fb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,23 +17,24 @@ pipeline { } } - stage('Run Selenium tests') { - when { - expression { - return (GIT_BRANCH.startsWith('PR') || GIT_BRANCH.endsWith('-QA')) - } - } - steps { - sh ''' - ./gradlew integrationTest -Dselenium.host=jenkins - ''' - } - post { - always { - junit 'backend/build/test-results/integrationTest/**/*.xml' - } - } - } +# Commented out, for the time being, per SHIBUI-1505 +# stage('Run Selenium tests') { +# when { +# expression { +# return (GIT_BRANCH.startsWith('PR') || GIT_BRANCH.endsWith('-QA')) +# } +# } +# steps { +# sh ''' +# ./gradlew integrationTest -Dselenium.host=jenkins +# ''' +# } +# post { +# always { +# junit 'backend/build/test-results/integrationTest/**/*.xml' +# } +# } +# } stage('Build Docker images') { when { From 4f1748d8752782d5edb23ef09678a7d9170c2ae4 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 19 Sep 2019 16:00:43 -0700 Subject: [PATCH 2/4] SHIBUI-1505 Updated comment format to hopefully be accurate this time. --- Jenkinsfile | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bde811fb4..0c3b7a279 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,25 +17,25 @@ pipeline { } } -# Commented out, for the time being, per SHIBUI-1505 -# stage('Run Selenium tests') { -# when { -# expression { -# return (GIT_BRANCH.startsWith('PR') || GIT_BRANCH.endsWith('-QA')) -# } -# } -# steps { -# sh ''' -# ./gradlew integrationTest -Dselenium.host=jenkins -# ''' -# } -# post { -# always { -# junit 'backend/build/test-results/integrationTest/**/*.xml' -# } -# } -# } - +/* Commented out, for the time being, per SHIBUI-1505 + stage('Run Selenium tests') { + when { + expression { + return (GIT_BRANCH.startsWith('PR') || GIT_BRANCH.endsWith('-QA')) + } + } + steps { + sh ''' + ./gradlew integrationTest -Dselenium.host=jenkins + ''' + } + post { + always { + junit 'backend/build/test-results/integrationTest/**/*.xml' + } + } + } +*/ stage('Build Docker images') { when { expression { From 8b3d2f5e0ab150da5c96cd812ff6fb2b65952860 Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 19 Sep 2019 16:05:54 -0700 Subject: [PATCH 3/4] SHIBUI-1505 Another comment fix. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0c3b7a279..1eadd28b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { } post { always { - junit 'backend/build/test-results/integrationTest/**/*.xml' +// junit 'backend/build/test-results/integrationTest/**/*.xml' } } } From 18b01ec63c6dcca56fa973dacf199a25ffc6a6ba Mon Sep 17 00:00:00 2001 From: Bill Smith Date: Thu, 19 Sep 2019 16:07:23 -0700 Subject: [PATCH 4/4] SHIBUI-1505 You win, Jenkins. --- Jenkinsfile | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1eadd28b3..56a4ea3f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,25 +17,6 @@ pipeline { } } -/* Commented out, for the time being, per SHIBUI-1505 - stage('Run Selenium tests') { - when { - expression { - return (GIT_BRANCH.startsWith('PR') || GIT_BRANCH.endsWith('-QA')) - } - } - steps { - sh ''' - ./gradlew integrationTest -Dselenium.host=jenkins - ''' - } - post { - always { -// junit 'backend/build/test-results/integrationTest/**/*.xml' - } - } - } -*/ stage('Build Docker images') { when { expression {