Add test codes and fix the build failure (#117)

* update run*.sh

* use docker agent

* removed println for unavilable JAVA_HOME

* stash output

* add test

* Fix typo

* Update

* Update

Author: josephca

Jenkinsfile

@@ -1,12 +1,10 @@
 #!groovy​
 
 pipeline {
-    agent any
-    
-    tools {
-        jdk 'oracle-jdk8-latest'
+    agent {
+        label "docker-build"
     }
-    
+
     options {
         timestamps() 
         skipStagesAfterUnstable()
@@ -21,23 +19,60 @@ pipeline {
 
                     def sys_info = sh(script: "uname -a", returnStdout: true).trim()
                     println("System information: ${sys_info}")
-                    println("JAVE_HOME: ${JAVA_HOME}")
 
                     sh '''
                         java -version
                         which java    
                     '''
 
-                    dir('dev') { sh './gradlew --stacktrace' }
+                    dir('dev') { 
+                        sh './gradlew --stacktrace' 
+                    }
                 }
             }
         } 
+
+        stage('Test') {
+            steps {
+                script {
+                    sh '''#!/usr/bin/env bash
+                        docker build --no-cache -t test-image ./dev
+                        export CWD=$(pwd)
+                        echo "Current directory is ${CWD}"
+                        docker run -v /var/run/docker.sock:/var/run/docker.sock -v ${CWD}/dev:/development test-image
+
+                        rm $WORKSPACE/dev/ant_build/artifacts/codewind-openapi-eclipse-test-*.zip
+                    '''
+                    dir('dev') { 
+                        stash name: 'codewind-openapi-eclipse-zip', includes: 'ant_build/artifacts/codewind-openapi-eclipse-*.zip'
+                    }
+                }
+            }
+        }  
 
         stage('Deploy') {
+            // This when clause disables PR build uploads; you may comment this out if you want your build uploaded.
+            when {
+                beforeAgent true
+                not {
+                    changeRequest()
+                }
+            }
+
+            options {
+                skipDefaultCheckout()
+            }
+
+            agent any
+
             steps {
                 sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
                     println("Deploying codewind-openapi-eclipse to downoad area...")
-                  
+                    
+                    dir("$WORKSPACE/dev") {
+                        unstash 'codewind-openapi-eclipse-zip'
+                    }
+                    
                     sh '''
                         export REPO_NAME="codewind-openapi-eclipse"
                         export OUTPUT_NAME="codewind-openapi-eclipse"
@@ -48,8 +83,6 @@ pipeline {
                         export sshHost="genie.codewind@projects-storage.eclipse.org"
                         export deployDir="/home/data/httpd/download.eclipse.org/codewind/$REPO_NAME"
 
-                        rm $OUTPUT_DIR/$REPO_NAME-test-*.zip
-                    
                         if [ -z $CHANGE_ID ]; then
                             UPLOAD_DIR="$GIT_BRANCH/$BUILD_ID"
                             BUILD_URL="$DOWNLOAD_AREA_URL/$UPLOAD_DIR"
@@ -81,5 +114,19 @@ pipeline {
                 }
             }
         }       
-    }    
+    } 
+
+    post {
+        always {
+            sh '''#!/usr/bin/env bash
+                # Docker system prune
+                echo "Docker system prune ..."
+                docker system df
+                docker system prune -a --volumes -f
+                docker builder prune -a -f
+                docker system df
+                df -lh
+            '''
+        }
+    }      
 }

dev/run.sh

@@ -28,8 +28,8 @@ xvfb-run ./runTest.sh
 
 return_code=$?
 
-echo "Copying test result to results.xml"
-cp /tmp/results.xml /development/results.xml
+echo "Test result filer is: /development/junit-results.xml"
+ls -l /development
 
 echo "Test finished with return code $return_code"
 return $return_code

dev/runTest.sh

@@ -19,10 +19,6 @@ fi
 
 export ADDITIONAL_ENV_VARS="-Duser.timezone=America/Toronto  $ADDITIONAL_ENV_VARS"
 
-if [ "$run_on_ui_thread" == "true" ]; then
-	export APPLICATION_TYPE=org.eclipse.test.uitestapplication
-fi
-
 echo TEST CLASS NAME is $TEST_CLASS_NAME
 echo TEST PLUG-IN NAME is $TEST_PLUGIN_NAME
 echo APPLICATION_TYPE is $APPLICATION_TYPE
@@ -54,7 +50,7 @@ $ADDITIONAL_ENV_VARS \
 -application $APPLICATION_TYPE  \
 -data /tmp/workspace-location  \
 -testPluginName $TEST_PLUGIN_NAME  \
--className $TEST_CLASS_NAME formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,/tmp/results.xml  \
+-className $TEST_CLASS_NAME formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,/development/junit-results.xml  \
 -vmargs  \
 -Xms256m  \
 -Xmx1024m  \