Fix TCK job configuration and script.

jakartaee · Aug 2, 2019 · bfcaa33 · bfcaa33
1 parent dbafa89
commit bfcaa33
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 29 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -51,9 +51,9 @@ spec:
     string(name: 'JAF_BUNDLE_URL',
            defaultValue: 'http://central.maven.org/maven2/com/sun/activation/jakarta.activation/1.2.1/jakarta.activation-1.2.1.jar',
            description: 'URL required for downloading JAF implementation jar' )
-    string(name: 'JAVAMAIL_TCK_BUNDLE_URL',
-           defaultValue: 'https://jenkins.eclipse.org/javamail/job/javamail-tck/job/master/lastSuccessfulBuild/artifact/bundles/javamailtck-1.6_latest.zip',
-           description: 'URL required for downloading JavaMail TCK zip' )
+    string(name: 'MAIL_TCK_BUNDLE_URL',
+           defaultValue: 'https://jenkins.eclipse.org/javamail/job/javamail-tck/job/master/lastSuccessfulBuild/artifact/bundles/mail-tck-1.6.0.zip',
+           description: 'URL required for downloading Jakarta Mail TCK zip' )
   }
   environment {
     ANT_OPTS = "-Djavax.xml.accessExternalStylesheet=all -Djavax.xml.accessExternalSchema=all -Djavax.xml.accessExternalDTD=file,http" 

diff --git a/docker/run_jakartamailtck.sh b/docker/run_jakartamailtck.sh
@@ -19,52 +19,53 @@ WGET_PROPS="-q --no-cache"
 if [ -z "$JAF_BUNDLE_URL" ];then
   export JAF_BUNDLE_URL=http://central.maven.org/maven2/com/sun/activation/jakarta.activation/1.2.1/jakarta.activation-1.2.1.jar
 fi
-if [ -z "$JAVAMAIL_TCK_BUNDLE_URL" ];then
-  export JAVAMAIL_TCK_BUNDLE_URL=https://jenkins.eclipse.org/javamail/job/javamail-tck/job/master/lastSuccessfulBuild/artifact/bundles/javamailtck-1.6_latest.zip
+if [ -z "$MAIL_TCK_BUNDLE_URL" ];then
+  export MAIL_TCK_BUNDLE_URL=https://jenkins.eclipse.org/javamail/job/javamail-tck/job/master/lastSuccessfulBuild/artifact/bundles/mail-tck-1.6.0.zip
 fi
 wget $WGET_PROPS $JAF_BUNDLE_URL -O jakarta.activation.jar
-wget $WGET_PROPS $JAVAMAIL_TCK_BUNDLE_URL -O javamailtck.zip
+wget $WGET_PROPS $MAIL_TCK_BUNDLE_URL -O mailtck.zip
 cp ${WORKSPACE}/mail/target/jakarta.mail.jar ${WORKSPACE}
 
-unzip -q -o ${WORKSPACE}/javamailtck.zip -d ${WORKSPACE}
+unzip -q -o ${WORKSPACE}/mailtck.zip -d ${WORKSPACE}
 
-export TS_HOME=${WORKSPACE}/javamailtck
+export TS_HOME=${WORKSPACE}/mail-tck
 
-sed -i "s#^TS_HOME=.*#TS_HOME=$TS_HOME#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JAVA_HOME=.*#JAVA_HOME=$JAVA_HOME#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JARPATH=.*#JARPATH=$WORKSPACE#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JAVAMAIL_SERVER=.*#JAVAMAIL_SERVER=localhost -pn 1143#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JAVAMAIL_PROTOCOL=.*#JAVAMAIL_PROTOCOL=imap#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JAVAMAIL_TRANSPORT_PROTOCOL=.*#JAVAMAIL_TRANSPORT_PROTOCOL=smtp#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JAVAMAIL_TRANSPORT_SERVER=.*#JAVAMAIL_TRANSPORT_SERVER=localhost -tpn 1025#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JAVAMAIL_USERNAME=.*#JAVAMAIL_USERNAME=$MAIL_USER#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^JAVAMAIL_PASSWORD=.*#JAVAMAIL_PASSWORD=1234#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^SMTP_DOMAIN=.*#SMTP_DOMAIN=james.local#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^SMTP_FROM=.*#SMTP_FROM=user01@james.local#g" "$TS_HOME/lib/javamail.jte"
-sed -i "s#^SMTP_TO=.*#SMTP_TO=user01@james.local#g" "$TS_HOME/lib/javamail.jte"
+sed -i "s#^TS_HOME=.*#TS_HOME=$TS_HOME#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JAVA_HOME=.*#JAVA_HOME=$JAVA_HOME#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JARPATH=.*#JARPATH=$WORKSPACE#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JAVAMAIL_SERVER=.*#JAVAMAIL_SERVER=localhost -pn 1143#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JAVAMAIL_PROTOCOL=.*#JAVAMAIL_PROTOCOL=imap#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JAVAMAIL_TRANSPORT_PROTOCOL=.*#JAVAMAIL_TRANSPORT_PROTOCOL=smtp#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JAVAMAIL_TRANSPORT_SERVER=.*#JAVAMAIL_TRANSPORT_SERVER=localhost -tpn 1025#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JAVAMAIL_USERNAME=.*#JAVAMAIL_USERNAME=$MAIL_USER#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^JAVAMAIL_PASSWORD=.*#JAVAMAIL_PASSWORD=1234#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^SMTP_DOMAIN=.*#SMTP_DOMAIN=james.local#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^SMTP_FROM=.*#SMTP_FROM=user01@james.local#g" "$TS_HOME/lib/ts.jte"
+sed -i "s#^SMTP_TO=.*#SMTP_TO=user01@james.local#g" "$TS_HOME/lib/ts.jte"
+
+mkdir -p ${HOME}/.m2
 
 cd $TS_HOME/tests/mailboxes
 export CLASSPATH=$TS_HOME/tests/mailboxes:$WORKSPACE/jakarta.mail.jar:$WORKSPACE/jakarta.activation.jar:$CLASSPATH
 javac -cp $CLASSPATH fpopulate.java
-java -cp $CLASSPATH fpopulate -s test1 \
-    -d imap://user01%40james.local:1234@localhost:1143
+java -cp $CLASSPATH fpopulate -s test1 -d imap://user01%40james.local:1234@localhost:1143
 
 which ant
 ant -version
 
-cd $WORKSPACE/javamailtck/
-ant -Dreport.dir=$WORKSPACE/JTreport/mailtck \
-    -Dwork.dir=$WORKSPACE/JTwork/mailtck run
+cd $WORKSPACE/mail-tck/
+ant -Dreport.dir=$WORKSPACE/JTreport/mail-tck -Dwork.dir=$WORKSPACE/JTwork/mail-tck run
 
 HOST=`hostname -f`
-echo "1 mailtck $HOST" > $WORKSPACE/args.txt
+echo "1 mail-tck $HOST" > $WORKSPACE/args.txt
 
 mkdir -p $WORKSPACE/results/junitreports/
+
 $JAVA_HOME/bin/java -Djunit.embed.sysout=true \
     -jar ${WORKSPACE}/docker/JTReportParser/JTReportParser.jar \
     $WORKSPACE/args.txt $WORKSPACE/JTreport $WORKSPACE/results/junitreports/ 
 
-tar zcf ${WORKSPACE}/mailtck-results.tar.gz \
-    $WORKSPACE/JTreport/mailtck \
-    $WORKSPACE/JTwork/mailtck \
+tar zcf ${WORKSPACE}/mail-tck-results.tar.gz \
+    $WORKSPACE/JTreport/mail-tck \
+    $WORKSPACE/JTwork/mail-tck \
     $WORKSPACE/results/junitreports/