Merge pull request #273 from jenkinsci/revert-265-JENKINS-50933-it

Revert "[JENKINS-50933] - Integration tests with Jenkins Core"
jenkinsci · May 30, 2018 · cc7778e · cc7778e
2 parents de06898 + 16d05f3
commit cc7778e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 111 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,3 @@ target
 /.project
 /.settings
 .fbExcludeFilterFile
-src/test/it/out
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,38 +4,53 @@
 properties([[$class: 'BuildDiscarderProperty',
                 strategy: [$class: 'LogRotator', numToKeepStr: '10']]])
 
+
 /* These platforms correspond to labels in ci.jenkins.io, see:
  *  https://github.com/jenkins-infra/documentation/blob/master/ci.adoc
  */
 List platforms = ['linux', 'windows']
 Map branches = [:]
+
 for (int i = 0; i < platforms.size(); ++i) {
     String label = platforms[i]
     branches[label] = {
         node(label) {
             timestamps {
-                checkout scm
-                infra.runMaven(["--batch-mode", "clean", "install", "-Dmaven.test.failure.ignore=true"])
-
-                /* Archive the test results */
-                try {
-                  junit '**/target/surefire-reports/TEST-*.xml'
-                } catch(Exception ex) {
-                  echo "Ignoring JUnit step failure: ${ex.message}"
+                stage('Checkout') {
+                    checkout scm
                 }
 
-                if (label == 'linux') {
-                  archiveArtifacts artifacts: 'target/**/*.jar'
-                  findbugs pattern: '**/target/findbugsXml.xml'
+                stage('Build') {
+                    withEnv([
+                        "JAVA_HOME=${tool 'jdk8'}",
+                        "PATH+MVN=${tool 'mvn'}/bin",
+                        'PATH+JDK=$JAVA_HOME/bin',
+                    ]) {
+                        timeout(30) {
+                            String command = "mvn --batch-mode clean install -Dmaven.test.failure.ignore=true ${infra.isRunningOnJenkinsInfra() ? '-s settings-azure.xml' : ''} -e"
+                            if (isUnix()) {
+                                sh command
+                            }
+                            else {
+                                bat command
+                            }
+                        }
+                    }
+                }
+
+                stage('Archive') {
+                    /* Archive the test results */
+                    junit '**/target/surefire-reports/TEST-*.xml'
+
+                    if (label == 'linux') {
+                      archiveArtifacts artifacts: 'target/**/*.jar'
+                      findbugs pattern: '**/target/findbugsXml.xml'
+                    }
                 }
             }
         }
     }
 }
 
-stage("Build Remoting") {
-    /* Execute our platforms in parallel */
-    //TODO uncomment parallel(branches)
-}
-
-essentialsTest(baseDir: "src/test/it")
+/* Execute our platforms in parallel */
+parallel(branches)
diff --git a/src/test/it/Makefile b/src/test/it/Makefile
diff --git a/src/test/it/essentials.yml b/src/test/it/essentials.yml
diff --git a/src/test/it/packager-config.yml b/src/test/it/packager-config.yml