From: Robert Varga Date: Tue, 15 Nov 2022 22:49:29 +0000 (+0000) Subject: Merge "Update cloud image Ubuntu18.04 mininet ovs" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f57f879de768ad678ccc4228f5d975aebfc7cdb5;hp=ec426fabac697d7fd7ef97574e178ca88a685192;p=releng%2Fbuilder.git Merge "Update cloud image Ubuntu18.04 mininet ovs" --- diff --git a/global-jjb b/global-jjb index 98090d2e5..3c627ccf0 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 98090d2e52c78ada3ae2bc3fe4cb918df309a207 +Subproject commit 3c627ccf046b02f12767aa45d9ac4bf515352f2f diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg index dcbcb5f6a..3e5b61dcd 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-1c-4g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221016-223020.545 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221101-220103.978 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg index 3f5940e5c..58913d1cb 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-2c-2g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221016-223020.545 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221101-220103.978 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg index fa81881ec..3723fe3c7 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221016-223020.545 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221101-220103.978 HARDWARE_ID=v3-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg index 18be072c7..1136fe1a3 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-4c-4g.cfg @@ -1,3 +1,3 @@ LABELS=centos7-docker-4c-4g -IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221016-223020.545 +IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20221101-220103.978 HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg index 0dddd11c8..3d7f399a0 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg @@ -1,4 +1,4 @@ LABELS=centos7-robot-2c-8g -IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221016-223041.341 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221101-220138.675 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=16 diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg index 43ce01228..d7a73a33c 100644 --- a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg @@ -1,4 +1,4 @@ LABELS=queue-disttest-2c-1g -IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221016-223041.341 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221101-220138.675 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=1 diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg index ba081df5d..52fe1dade 100644 --- a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg @@ -1,5 +1,5 @@ LABELS=queue-intque-2c-1g -IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221016-223041.341 +IMAGE_NAME=ZZCI - CentOS 7 - robot - x86_64 - 20221101-220138.675 HARDWARE_ID=v3-standard-2 INSTANCE_CAP=1 NUM_EXECUTORS=4 diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index ea7f07290..b3fdf276f 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -97,36 +97,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-0.16.x - jobs: - - "{project-name}-maven-javadoc-jobs" - - "{project-name}-rtd-jobs": - build-node: centos7-builder-2c-2g - project-pattern: bgpcep - rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-bgpcep/47576/ - rtd-token: dbe9d1aabbe8812a26b428908f6613c28e3191fc - - odl-maven-jobs-jdk11 - - odl-maven-verify-jobs - - stream: 0.16.x - project: "bgpcep" - project-name: "bgpcep" - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: 0.16.x - java-version: "openjdk11" - mvn-settings: "bgpcep-settings" - mvn-opts: "-Xmx2048m" - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream} - email-upstream: "[bgpcep] [odlparent] [yangtools] [controller] [mdsal]" - # Used by the release job - staging-profile-id: 9427a05049030 - - project: name: bgpcep-release-management jobs: diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index bfd3c2e96..c0f7961f0 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -25,6 +25,32 @@ # Used by the release job staging-profile-id: 96c1c9177efdd +- project: + name: controller-6.0.x + jobs: + - "{project-name}-rtd-jobs": + build-node: centos7-builder-2c-2g + project-pattern: controller + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-controller/48288/ + rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: 6.0.x + project: "controller" + project-name: "controller" + branch: 6.0.x + build-node: centos8-builder-4c-4g + java-version: "openjdk17" + mvn-settings: "controller-settings" + mvn-goals: "clean deploy -Pdocs" + build-timeout: 90 + dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}" + email-upstream: "[controller] [odlparent] [yangtools] [aaa]" + + # Used by the release job + staging-profile-id: 96c1c9177efdd + - project: name: controller-5.0.x jobs: diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index e54ca5075..d9210e264 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -24,6 +24,31 @@ # Used by the release job staging-profile-id: 96fca0367756c +- project: + name: infrautils-4.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-jdk17 + - odl-maven-verify-jobs-jdk17 + + stream: 4.0.x + project: "infrautils" + project-name: "infrautils" + branch: "4.0.x" + 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: diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index a6d755ed6..5a40f9774 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -151,6 +151,7 @@ name: distribution-release jobs: - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true project: "integration/distribution" diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index d9aadb32d..3acb7f6c7 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -832,7 +832,7 @@ docker_system_count: "1" docker_system_flavor: "v3-standard-2" - docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20221016-223020.545" + docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20221101-220103.978" ##################### # Job Configuration # diff --git a/jjb/lf-infra/zzz-test-release.yaml b/jjb/lf-infra/zzz-test-release.yaml index f87f5fe9e..d979fa26f 100644 --- a/jjb/lf-infra/zzz-test-release.yaml +++ b/jjb/lf-infra/zzz-test-release.yaml @@ -2,7 +2,9 @@ - project: name: "{project-name}-maven-stage-{stream}" jobs: - - gerrit-maven-stage + - gerrit-maven-stage: + sbom-generator: true + project: zzz-test-release project-name: zzz-test-release stream: master diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index d37026386..0ce53e2cb 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -29,6 +29,36 @@ # Used by the release job staging-profile-id: a67b22fc3663f +- project: + name: netconf-4.0.x + jobs: + - "{project-name}-rtd-jobs": + build-node: centos8-builder-2c-2g + project-pattern: netconf + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/ + rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc + - gerrit-tox-verify: + build-node: centos8-builder-2c-2g + parallel: true + - odl-maven-jobs-jdk17 + - odl-maven-verify-jobs-jdk17 + + project: "netconf" + project-name: "netconf" + stream: 4.0.x + branch: "4.0.x" + build-node: centos8-builder-4c-4g + java-version: "openjdk17" + karaf-version: "netconf" + mvn-settings: "netconf-settings" + mvn-goals: "clean deploy -Pintegrationtests" + build-timeout: 90 + dependencies: "aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}" + email-upstream: "[netconf] [aaa] [controller] [odlparent] [yangtools]" + + # Used by the release job + staging-profile-id: a67b22fc3663f + - project: name: netconf-3.0.x jobs: diff --git a/jjb/releng-maven-mri-stage.yaml b/jjb/releng-maven-mri-stage.yaml index d08c7b4c2..857cfbf24 100644 --- a/jjb/releng-maven-mri-stage.yaml +++ b/jjb/releng-maven-mri-stage.yaml @@ -96,6 +96,10 @@ mvn-version: mvn35 ossrh-profile-id: "" mvn-pom: "" + sbom-flags: "" + sbom-path: "$WORKSPACE" + sbom-generator: false + sbom-generator-version: "v0.0.15" sign-artifacts: false sign-mode: serial stream: master @@ -145,6 +149,14 @@ name: STAGING_PROFILE_ID default: "{staging-profile-id}" description: Nexus staging profile ID. + - string: + name: SBOM_GENERATOR_VERSION + default: "{sbom-generator-version}" + description: SBOM generator version to download and run. + - string: + name: SBOM_PATH + default: "{sbom-path}" + description: path where SBOM needs to be executed. builders: - lf-infra-pre-build @@ -166,6 +178,14 @@ - shell: !include-raw-escape: global-jjb/shell/maven-patch-release.sh - lf-maven-build: mvn-goals: "{mvn-goals}" + # With SBOM Generator + - conditional-step: + condition-kind: boolean-expression + condition-expression: "{sbom-generator}" + steps: + - shell: echo 'Running SBOM Generator' + - lf-infra-maven-sbom-generator: + sbom-flags: "{sbom-flags}" - lf-sigul-sign-dir: sign-artifacts: "{sign-artifacts}" sign-dir: "$WORKSPACE/m2repo" diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index 3ee731f18..7c3b93099 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -12,9 +12,11 @@ - gerrit-maven-stage: sign-artifacts: true + sbom-generator: true cron: "" - gerrit-maven-mri-stage: + sbom-generator: true sign-artifacts: true cron: "" @@ -33,10 +35,12 @@ build-timeout: 180 - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true cron: "" - gerrit-maven-mri-stage: + sbom-generator: true sign-artifacts: true cron: ""