From: Martin Stockhammer <martin_s@apache.org>
Date: Sun, 6 May 2018 18:51:42 +0000 (+0200)
Subject: Removing chrome test and fixing steps
X-Git-Tag: archiva-2.2.4~23
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=296a8e9b695809b8af808ebdcd774d7f92f39d8c;p=archiva.git

Removing chrome test and fixing steps
---

diff --git a/Jenkinsfile-itest b/Jenkinsfile-itest
index 1c5af21c7..0abb455c2 100644
--- a/Jenkinsfile-itest
+++ b/Jenkinsfile-itest
@@ -65,8 +65,6 @@ pipeline {
                                       openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
                     )
                             {
-                                sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
-                                sh "./src/ci/scripts/prepareWorkspace.sh"
                                 // Needs a lot of time to reload the repository files, try without cleanup
                                 // Not sure, but maybe
                                 // sh "rm -rf .repository"
@@ -93,57 +91,6 @@ pipeline {
                 }
             }
         }
-
-        // Uses a docker container that is started by script. Maybe we could use the docker functionality
-        // of the jenkins pipeline in the future.
-        stage('Test chrome') {
-            steps {
-                timeout(120) {
-                    withCredentials([[$class          : 'UsernamePasswordMultiBinding', credentialsId: DOCKERHUB_CREDS,
-                                      usernameVariable: 'DOCKER_HUB_USER', passwordVariable: 'DOCKER_HUB_PW']]) {
-                        withMaven(maven: buildMvn, jdk: buildJdk,
-                                mavenSettingsConfig: deploySettings,
-                                mavenLocalRepo: ".repository",
-                                options: [concordionPublisher(disabled: true), dependenciesFingerprintPublisher(disabled: true),
-                                          findbugsPublisher(disabled: true), artifactsPublisher(disabled: true),
-                                          invokerPublisher(disabled: true), jgivenPublisher(disabled: true),
-                                          junitPublisher(disabled: true, ignoreAttachments: false),
-                                          openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
-                        )
-                                {
-                                    sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
-                                    sh "./src/ci/scripts/prepareWorkspace.sh"
-                                    sh "chmod 755 src/ci/scripts/container_webtest.sh"
-                                    sh "src/ci/scripts/container_webtest.sh start"
-                                    // Needs a lot of time to reload the repository files, try without cleanup
-                                    // Not sure, but maybe
-                                    // sh "rm -rf .repository"
-
-                                    // Run test phase / ignore test failures
-                                    // -B: Batch mode
-                                    // -U: Force snapshot update
-                                    // -e: Produce execution error messages
-                                    // -fae: Fail at the end
-                                    // -Pci-server: Profile for CI Server
-                                    // -Pit-js: Runs the Selenium tests
-                                    // -Pchrome: Activates the Selenium Chrome Test Agent
-                                    sh "mvn clean install -B -V -U -e -fae -Dmaven.compiler.fork=true -DmaxWaitTimeInMs=2000 -DseleniumRemote=true -Pci-server -Pit-js -Pchrome -pl :archiva-webapp-test -DtrimStackTrace=false"
-
-                                }
-                    }
-                }
-            }
-            post {
-                always {
-                    sh "src/ci/scripts/container_webtest.sh stop"
-                    junit testResults: '**/target/failsafe-reports/TEST-*.xml'
-                }
-                failure {
-                    notifyBuild("Failed in chrome test stage")
-                }
-            }
-        }
-
     }
     post {
         unstable {