From 3a6beb73feda59a9601244ca2a89df3762669d27 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 Apr 2022 17:11:42 +0200 Subject: [PATCH] Add jobs for infrautils/3.0.x We have branched infrautils, create jobs to support the new branch. Also adjust master and sonar jobs to run with JDK17 only. Change-Id: Ia1a1f9f0fd2e94d608dade8fb7895764c6667305 Signed-off-by: Robert Varga --- jjb/infrautils/infrautils.yaml | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index d604430b77..0d9885494d 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -8,14 +8,39 @@ project-pattern: infrautils rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs + - odl-maven-jobs-jdk17 - odl-maven-verify-jobs-jdk17 stream: master project: "infrautils" project-name: "infrautils" branch: "master" + java-version: "openjdk17" + mvn-settings: "infrautils-settings" + build-node: centos8-builder-4c-4g + dependencies: "odlparent-merge-{stream}" + email-upstream: "[infrautils] [odlparent]" + + # Used by the release job + staging-profile-id: 96fca0367756c + +- project: + name: infrautils-3.0.x + jobs: + - "{project-name}-rtd-jobs": + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: infrautils + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ + rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 + - odl-maven-jobs-jdk11 + - odl-maven-verify-jobs + - odl-maven-verify-jobs-jdk17 + + stream: 3.0.x + project: "infrautils" + project-name: "infrautils" + branch: 3.0.x java-version: "openjdk11" mvn-settings: "infrautils-settings" build-node: centos8-builder-4c-4g @@ -101,10 +126,10 @@ project: "infrautils" project-name: "infrautils" branch: "master" - java-version: "openjdk11" + java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "infrautils-settings" - mvn-opts: "-Xmx1024m" + build-node: centos8-builder-4c-4g sonarcloud: true sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-api-token: "{sonarcloud_api_token}" -- 2.36.6