From b194e1056230c9004ca7d50cce07300d42875183 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 17 Jan 2019 20:42:54 +1000 Subject: [PATCH] Extend ${JOB_NAME} to include {java-version} param To support javadocs jobs to build with multiple versions of openjdk{8,11}, extend with '{java-version}' var to the ${JOB-NAME}. Extending the job name with (java-version) var, JJB ensures that its not passing the multiple java-versions as a list. The job failure can be seen on the lispflowmapping jobs. https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/lispflowmapping-maven-javadoc-verify-neon/71/ https://logs.opendaylight.org/releng/vex-yul-odl-jenkins-1/lispflowmapping-maven-javadoc-publish-neon/19 Change-Id: If2e189f3e76f36d73863d98f1217c0b42ada52f1 Signed-off-by: Anil Belur --- docs/jjb/lf-maven-jobs.rst | 4 ++-- jjb/lf-maven-jobs.yaml | 8 ++++---- releasenotes/notes/add-verify-param-a292c722d1abfb73.yaml | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/add-verify-param-a292c722d1abfb73.yaml diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst index 3a2a088c..25258aef 100644 --- a/docs/jjb/lf-maven-jobs.rst +++ b/docs/jjb/lf-maven-jobs.rst @@ -126,7 +126,7 @@ Expects javadocs to be available in $WORKSPACE/target/site/apidocs :Template Names: - - {project-name}-maven-javadoc-publish-{stream} + - {project-name}-maven-javadoc-publish-{stream}-{java-version} - gerrit-maven-javadoc-publish - github-maven-javadoc-publish @@ -172,7 +172,7 @@ Expects javadocs to be available in $WORKSPACE/target/site/apidocs :Template Names: - - {project-name}-maven-javadoc-verify-{stream} + - {project-name}-maven-javadoc-verify-{stream}-{java-version} - gerrit-maven-javadoc-verify - github-maven-javadoc-verify diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 9671ebbe..8ec5b345 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -310,7 +310,7 @@ - lf-provide-maven-settings-cleanup - job-template: - name: '{project-name}-maven-javadoc-publish-{stream}' + name: '{project-name}-maven-javadoc-publish-{stream}-{java-version}' id: gerrit-maven-javadoc-publish <<: *lf_maven_common # yamllint disable-line rule:key-duplicates @@ -340,7 +340,7 @@ branch-pattern: '**/{branch}' - job-template: - name: '{project-name}-maven-javadoc-publish-{stream}' + name: '{project-name}-maven-javadoc-publish-{stream}-{java-version}' id: github-maven-javadoc-publish <<: *lf_maven_common # yamllint disable-line rule:key-duplicates @@ -436,7 +436,7 @@ - lf-provide-maven-settings-cleanup - job-template: - name: '{project-name}-maven-javadoc-verify-{stream}' + name: '{project-name}-maven-javadoc-verify-{stream}-{java-version}' id: gerrit-maven-javadoc-verify <<: *lf_maven_common # yamllint disable-line rule:key-duplicates @@ -464,7 +464,7 @@ branch-pattern: '**/{branch}' - job-template: - name: '{project-name}-maven-javadoc-verify-{stream}' + name: '{project-name}-maven-javadoc-verify-{stream}-{java-version}' id: github-maven-javadoc-verify <<: *lf_maven_common # yamllint disable-line rule:key-duplicates diff --git a/releasenotes/notes/add-verify-param-a292c722d1abfb73.yaml b/releasenotes/notes/add-verify-param-a292c722d1abfb73.yaml new file mode 100644 index 00000000..483f9493 --- /dev/null +++ b/releasenotes/notes/add-verify-param-a292c722d1abfb73.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Extend ${JOB_NAME} to include {java-version} parameter to support jobs + to build with multiple versions of openjdk{8,11}. -- 2.16.6