Merge pull request #6 from Vlatombe/JENKINS-38928

[JENKINS-38928] Fix apply behaviour when form contains radio group
jenkinsci · Nov 4, 2016 · 4a72ea5 · 4a72ea5
2 parents a451868 + 3244114
commit 4a72ea5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,7 @@ node('hi-speed') {
         dir('plugin') {
             checkout scm
             timeout(30) {
-                withMaven(jdk: 'Oracle JDK 1.8 (latest)',
+                withMaven(jdk: 'Oracle JDK 8 (latest)',
                         maven: 'Maven 3.2.1') {
                     sh 'mvn clean install -B'
                     formElementPathVersion = sh script: 'cat target/form-element-path/META-INF/MANIFEST.MF | grep Implementation-Version | cut -f 2 -d ":" | xargs', returnStdout: true
@@ -19,32 +19,37 @@ node('hi-speed') {
                   filter: 'war/target/jenkins.war',
                   fingerprintArtifacts: true,
                   flatten: true,
-                  projectName: 'jenkins_lts_branch',
+                  projectName: 'core/jenkins_lts_branch',
                   selector: [
                           $class: 'StatusBuildSelector',
                           stable: false
                   ]
             ])
-            wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
-                withMaven(jdk: 'Oracle JDK 8 (latest)',
-                        maven: 'Maven 3.2.1') {
-                    withEnv(['BROWSER=firefox',
-                             'JENKINS_WAR=jenkins.war',
-                             'JENKINS_JAVA_HOME=/opt/jdk/jdk1.7.latest/',
-                             'JAVA_HOME=/opt/jdk/openjdk8.latest/',
-                             'EXERCISEDPLUGINREPORTER=textfile',
-                             "FORM_ELEMENT_PATH_VERSION=$formElementPathVersion"]) {
-                        sh '''
+            try {
+                wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
+                    withMaven(jdk: 'Oracle JDK 8 (latest)',
+                            maven: 'Maven 3.2.1') {
+                        withEnv(['BROWSER=firefox',
+                                 'JENKINS_WAR=jenkins.war',
+                                 'JENKINS_JAVA_HOME=/opt/jdk/jdk1.7.latest/',
+                                 'JAVA_HOME=/opt/jdk/openjdk8.latest/',
+                                 'EXERCISEDPLUGINREPORTER=textfile',
+                                 "FORM_ELEMENT_PATH_VERSION=${formElementPathVersion.trim()}"]) {
+                            sh '''
 unzip -p $JENKINS_WAR META-INF/MANIFEST.MF | perl -p -0777 -e 's/\\r?\\n //g' | fgrep Jenkins-Version
 cp $SAUCE_SECRET ~/.sauce-ondemand || true
 
 firefox --version
-mvn clean test -Dmaven.test.failure.ignore=true -DforkCount=1 -Dtest=FreestyleJobTest -B
+mvn clean test -Dmaven.test.failure.ignore=true -DforkCount=1 -B
 '''
+                        }
                     }
                 }
+            } finally {
+                step([$class: 'JUnitResultArchiver',
+                      testResults: '**/target/surefire-reports/TEST-*.xml'
+                ])
             }
-            archiveArtifacts artifacts: 'target/exercised-plugins.properties', excludes: null
         }
     }
 }
diff --git a/src/main/resources/org/jenkinsci/plugins/form-element-path.js b/src/main/resources/org/jenkinsci/plugins/form-element-path.js
@@ -124,6 +124,7 @@ Behaviour.addLoadEvent(function(){
             case "submit":
                 break;
             case "checkbox":
+            case "radio":
                 p = findParent(e);
                 if(e.groupingNode) {
                     e.formDom = {};