Merge "Update cloud image Ubuntu18.04 mininet ovs"

diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
new file mode 100644 (file)
index 0000000..ea754d8
--- /dev/null
+++ b/.github/workflows/gerrit-verify.yaml
@@ -0,0 +1,142 @@
+---
+name: Gerrit Verify
+
+# yamllint disable-line rule:truthy
+on:
+  workflow_dispatch:
+    inputs:
+      GERRIT_BRANCH:
+        description: "Branch that change is against"
+        required: true
+        type: string
+      GERRIT_CHANGE_ID:
+        description: "The ID for the change"
+        required: true
+        type: string
+      GERRIT_CHANGE_NUMBER:
+        description: "The Gerrit number"
+        required: true
+        type: string
+      GERRIT_CHANGE_URL:
+        description: "URL to the change"
+        required: true
+        type: string
+      GERRIT_EVENT_TYPE:
+        description: "Type of Gerrit event"
+        required: true
+        type: string
+      GERRIT_PATCHSET_NUMBER:
+        description: "The patch number for the change"
+        required: true
+        type: string
+      GERRIT_PATCHSET_REVISION:
+        description: "The revision sha"
+        required: true
+        type: string
+      GERRIT_PROJECT:
+        description: "Project in Gerrit"
+        required: true
+        type: string
+      GERRIT_REFSPEC:
+        description: "Gerrit refspec of change"
+        required: true
+        type: string
+
+concurrency:
+  group: ${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clear votes
+        uses: lfit/gerrit-review-action@v0.3
+        with:
+          host: ${{ vars.GERRIT_SERVER }}
+          username: ${{ vars.GERRIT_SSH_USER }}
+          key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
+          known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
+          gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+          gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+          vote-type: clear
+      - name: Allow replication
+        run: sleep 10s
+
+  actionlint:
+    needs: prepare
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lfit/checkout-gerrit-change-action@v0.3
+        with:
+          gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          delay: "0s"
+      - name: Download actionlint
+        id: get_actionlint
+        run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+        shell: bash
+      - name: Check workflow files
+        run: ${{ steps.get_actionlint.outputs.executable }} -color
+        shell: bash
+
+  # run pre-commit tox env separately to get use of more parallel processing
+  pre-commit:
+    needs: prepare
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lfit/checkout-gerrit-change-action@v0.3
+        with:
+          gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          delay: "0s"
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - name: Run static analysis and format checkers
+        run: pipx run pre-commit run --all-files --show-diff-on-failure
+
+  jjb-validation:
+    needs: prepare
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lfit/checkout-gerrit-change-action@v0.3
+        with:
+          gerrit-refspec: ${{ inputs.GERRIT_REFSPEC }}
+          delay: "0s"
+      - uses: actions/setup-python@v4
+        id: setup-python
+        with:
+          python-version: "3.11"
+      - name: Clone git submodules
+        run: git submodule update --init
+      - name: Run JJB Verify
+        run: |
+          python -m pip install --upgrade pip
+          pip install jenkins-job-builder
+          mkdir -p "${HOME}/.config/jenkins_jobs"
+          cat << EOF > "${HOME}/.config/jenkins_jobs/jenkins_jobs.ini"
+          [job_builder]
+          ignore_cache=True
+          keep_descriptions=False
+          include_path=.
+          recursive=True
+          query_plugins_info=False
+          config-xml=True
+          EOF
+          jenkins-jobs test -o archives/job-configs jjb/
+
+  vote:
+    if: ${{ always() }}
+    needs: [prepare, actionlint, pre-commit, jjb-validation]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: technote-space/workflow-conclusion-action@v3
+      - name: Set vote
+        uses: lfit/gerrit-review-action@v0.3
+        with:
+          host: ${{ vars.GERRIT_SERVER }}
+          username: ${{ vars.GERRIT_SSH_USER }}
+          key: ${{ secrets.GERRIT_SSH_PRIVKEY }}
+          known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }}
+          gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }}
+          gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }}
+          vote-type: ${{ env.WORKFLOW_CONCLUSION }}

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 3bf9f7e87e6b62ee40f57b4f4b6c30859fc1b58c..01e32d3938adcb55b431306e126dd3eae0b28255 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -10,6 +10,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - builder - x86_64 - 20221201-060105.225
 * ZZCI - CentOS 7 - builder - x86_64 - 20230301-060101.869
 * ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+* ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 * ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511
 * ZZCI - CentOS 7 - devstack - x86_64 - 20220915-220248.057
 * ZZCI - CentOS 7 - devstack - x86_64 - 20221016-125752.520
@@ -39,6 +40,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - docker - x86_64 - 20221201-220105.396
 * ZZCI - CentOS 7 - docker - x86_64 - 20230301-220107.956
 * ZZCI - CentOS 7 - docker - x86_64 - 20230401-220108.252
+* ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
 * ZZCI - CentOS 7 - helm - x86_64 - 20220401-000138.473
 * ZZCI - CentOS 7 - helm - x86_64 - 20220811-110654.568
 * ZZCI - CentOS 7 - helm - x86_64 - 20220915-220356.090
@@ -66,6 +68,7 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20221201-160128.560
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20230301-160121.204
 * ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
+* ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20220811-231817.668
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20230301-010147.625
 * ZZCI - CentOS Stream 8 - robot - x86_64 - 20230401-010209.151

diff --git a/global-jjb b/global-jjb
index de13320dea5c46324937b12f69435e082e4edf0b..e1b6f106a1ccdba4fdbd6fec12882167b3a6ad47 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit de13320dea5c46324937b12f69435e082e4edf0b
+Subproject commit e1b6f106a1ccdba4fdbd6fec12882167b3a6ad47

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
index 8ec456a3e6ce3875a0c4737b8d4645ee53bdad9c..c919338f89c39e6e022578d6ddb0762c5add4ae7 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index 7a8f051a6756d2d79af8c527c9a500a8a144854e..3b50f27fa3f62f835f022d6da925f0f05d010840 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index df7b88fe7748303a2294f96eceda6401cbbd8e7c..d74f7c2769f31a23d3816b29e7e36f79ef03bf2d 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index 96c6d6cf6fc5679da1708f356b71d595f64023f2..79f18eec090b13ffe9866f92648a92d50956a668 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index 3d6125e8ac27d1d5450e1da3393f8638bc37ef27..e555f191b38bef2daa3c7626308642f2396476fb 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index 413924145012f3a3e07b2a51e624e33d57f90543..3a75990146238c9f45e082e27e6ad78f6dcc6283 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos7-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 HARDWARE_ID=v3-standard-8

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 9f5e682cdb8900bae58ed4676845921b1e59ad0c..6a0ec162528fda44662613c3ce7056b16026eb38 100644 (file)
--- 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 - 20230401-220108.252
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
 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 f07d1778f6bad4d1d61846ffae48d75a768d0fc0..0f6e8b779a6458cfaf7f28e7c51fe9b74b9b21ce 100644 (file)
--- 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 - 20230401-220108.252
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
 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 600112a3b5fcd3cc2c8e0a6db15bdf58c2218f6e..795a3f4ae2c46a61c2257f2878f3703cde400c52 100644 (file)
--- 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 - 20230401-220108.252
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
 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 9efb04a457177ef9fca8cce341482c8a7d5490d1..420fea9c157b3b84deeb23e7f6a7916070d54d95 100644 (file)
--- 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 - 20230401-220108.252
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
index ccef3aaeb453543c012741be6e78bb6395382b41..e5397f7e4461dcaee29968df0836700ae646da5d 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-1g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
index 333c47e4005e8aeafd06edc84b1a25c8f0b60e6b..3e3a0537bd6f9389c747f98adf5d0ba5d10b0bef 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-2g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-2g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
index 9b96d08bb5ab27cc27f4d5afa38264b4eb839f10..d359f23951e949e4c6d1d7db02eab8a196c6501c 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-2c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-2c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg
index 78a0bbb51b427570cc335dbd65db8b70af12c59f..a81534409eff758247f14dc9817db8e05cc6fdb8 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-16g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-4c-16g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
index 0c28a68ab252c853d83ab79c9e2568da9c479d1a..ac98835440c4ccb8b979171b5e9a4ca2d11a8df6 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-4c-4g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
index 9982f77003df27f73f900a5271c31b055ac98dc8..39ec302cbd570faa48687870af5aed7cb9a51391 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos8-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
 LABELS=centos8-builder-8c-8g
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index 26b0eaf6fc4cac166a866d3d9a21f27091bbb8e5..ad64ac6a92ba01662ce16737902728afc338d701 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230401-060117.151
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20230501-060110.287
 AVAILABILITY_ZONE=nova
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 1c25c4c4d4a766417e2ffdf13ccca1e57fa519fc..6fdfd21fd8d8b0988666e835287b4cc821f63467 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -23,6 +23,30 @@
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
 
+- project:
+    name: aaa-0.17.x
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          project-pattern: aaa
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-aaa/47615/
+          rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    stream: 0.17.x
+    project: "aaa"
+    project-name: "aaa"
+    branch: 0.17.x
+    java-version: "openjdk17"
+    mvn-settings: "aaa-settings"
+    build-node: centos8-builder-4c-4g
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
+
+    # Used by the release job
+    staging-profile-id: 9318cf3c82c33
+
 - project:
     name: aaa-0.16.x
     jobs:

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 017caeb6164317540da33da4c37ee8f22d7c1f3d..28b38ea038d9a7b0d6fde665d4909945f2b69804 100644 (file)
--- 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-7.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: 7.0.x
+    project: "controller"
+    project-name: "controller"
+    branch: 7.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-6.0.x
     jobs:

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 79752284d662d9de4e099e18b7bf75dffc261c73..9a9ec3cfaeaeb0fe0c1cc211016805fda797c1c5 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -101,7 +101,7 @@
     # CSIT configuration
     odl_system_count: 1
     odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20230401-160111.589"
+    odl_system_image: "ZZCI - CentOS Stream 8 - builder - x86_64 - 20230501-160107.084"
     controller-max-mem: "2048m"
     openstack_system_count: 1
     openstack_system_flavor: "v3-standard-4"

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index 304d4b9f4cb7a81f6388c33114c2f74909858723..b0814ae96a6fb0f7131d5f30c27a2c1c357e8b68 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -9,7 +9,7 @@
       - potassium:
           branch: "master"
       - argon:
-          branch: "stable/master"
+          branch: "stable/argon"
       - chlorine:
           branch: "stable/chlorine"
 

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 6c967d0cb00c1d18940143b25126de8631bbcd8a..e0cab0203efe6fb2deed0e29cb332aa7b5d61240 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -916,9 +916,6 @@ fi
 
 FEATURE_TEST_STRING="features-test"
 FEATURE_TEST_VERSION="$BUNDLE_VERSION"
-if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
-    FEATURE_TEST_VERSION="$(sed -r "s%^([0-9]+)\.([0-9]+)\.0(.*)%0.\1.\2\3%" <<<"$BUNDLE_VERSION")"
-fi
 KARAF_VERSION=${KARAF_VERSION:-karaf4}
 
 # only manipulate feature repo in integration distro

diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh
index 2ae9b890593cf839effc2a6814babb200b9d4809..f346613e1972d151e71dc4b816c7e7a042f99074 100644 (file)
--- a/jjb/integration/distribution/distribution-check-bootup.sh
+++ b/jjb/integration/distribution/distribution-check-bootup.sh
@@ -37,9 +37,6 @@ echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
 FEATURE_TEST_STRING="features-test"
 FEATURE_TEST_VERSION="$BUNDLE_VERSION"
-if [ "$KARAF_ARTIFACT" = "opendaylight" ]; then
-    FEATURE_TEST_VERSION="$(echo "$BUNDLE_VERSION" | sed -E "s%^([0-9]+)\.([0-9]+)\.0(.*)%0.\1.\2\3%")"
-fi
 
 # only replace feature repo in integration/distro, MRI projects need to pull in
 # the features they need by themselves

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 1917bd1e53378ef651d7cd18d7382ef1a0d6955a..b9a5ab90e477e754e5f36d4dee031d32f0937d45 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -52,7 +52,7 @@
     email-upstream: "[int/dist]"
     type: managed
     profile: "-Pmanaged"
-    forbidden-files: '(opendaylight\/.*|docker\/.*)'
+    forbidden-files: '(docker\/.*)'
     java-version: "openjdk17"
     jre: "openjdk17"
     karaf-version: karaf4
@@ -87,84 +87,6 @@
             ovsdb-maven-merge-{stream},
             serviceutils-maven-merge-{stream},
 
-- project:
-    name: distribution-full
-    jobs:
-      # gerrit- is generic template, distribution- is project specific.
-      - "distribution-merge-{type}-{stream}"
-      - "distribution-verify-{type}-{stream}"
-      - "distribution-check-{type}-{stream}"
-
-    project: integration/distribution
-    project-name: distribution
-    build-node: centos8-builder-4c-4g
-    mvn-settings: integration-distribution-settings
-    mvn-goals: "clean install dependency:tree -DoutputFile=dependency_tree.txt"
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn38
-    email-upstream: "[int/dist]"
-    type: full
-    profile: "-Punmanaged"
-    files: "opendaylight/**"
-    java-version: "openjdk17"
-    karaf-version: odl
-    dist-pom: "distribution/opendaylight/pom.xml"
-    stream:
-      - potassium:
-          branch: "master"
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - argon:
-          branch: "stable/argon"
-          dependencies: >
-            distribution-merge-managed-{stream},
-      - chlorine:
-          branch: "stable/chlorine"
-          dependencies: >
-            distribution-merge-managed-{stream},
-
-- project:
-    name: distribution-release
-    jobs:
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          sbom-path: "opendaylight"
-
-    project: "integration/distribution"
-    project-name: "distribution"
-    build-node: centos8-builder-4c-4g
-    use-release-file: false
-    mvn-goals: "clean deploy -f opendaylight/pom.xml"
-    mvn-settings: "integration-distribution-settings"
-    mvn-opts: "-Xmx1024m"
-    mvn-version: mvn38
-    java-version: "openjdk17"
-    email-upstream: "[int/dist]"
-
-    # Used by the release job
-    staging-profile-id: 2af042ed81d5e2
-
-    stream:
-      - potassium:
-          branch: "master"
-      - argon:
-          branch: "stable/argon"
-      - chlorine:
-          branch: "stable/chlorine"
-
-- project:
-    name: distribution-release-management
-    jobs:
-      - gerrit-release-merge
-
-    project: "integration/distribution"
-    project-name: distribution
-
-    build-node: centos7-builder-2c-1g
-    mvn-settings: integration-distribution-settings
-    build-timeout: 60
-
 - project:
     name: distribution-sonar
     jobs:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 7b52bd5827e5ed0e335dedb5dab1f810136f479a..6886e0e56ce7c9685db6cd74de54c90fabfd7cd6 100644 (file)
--- 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 - 20230401-220108.252"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20230501-220111.311"
 
     #####################
     # Job Configuration #

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 5cae95da3fcc7d8eb56d43d5cbaeed57ce988990..b0b5a6ab26cbba5216b638dde32e113b4c794249 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -33,6 +33,40 @@
     # Used by the release job
     staging-profile-id: 880d5ac25eaa
 
+- project:
+    name: odlparent-12.0.x
+    jobs:
+      - "{project-name}-rtd-jobs":
+          build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
+          project-pattern: odlparent
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
+          rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+      - gerrit-tox-verify
+
+    stream: 12.0.x
+    project: odlparent
+    project-name: odlparent
+    branch: 12.0.x
+
+    mvn-settings: odlparent-settings
+    build-node: centos8-builder-4c-4g
+
+    dependencies: ""
+    email-upstream: "[odlparent]"
+    archive-artifacts: >
+      **/*.prop
+      **/*.log
+      **/target/surefire-reports/*-output.txt
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/hs_err_*.log
+      **/target/feature/feature.xml
+
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-11.0.x
     jobs:

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index e62fb572379ada7a5e5d93b854d612beed3557c6..e36be2b8825fd7fb716a84abddb23c59ffe39dd4 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -32,7 +32,7 @@
     build-node: centos8-builder-2c-2g
     archive-artifacts: "**/*.log"
     build-timeout: 30
-    jjb-version: 4.1.0
+    jjb-version: 5.0.2
 
 - project:
     name: builder-openstack

diff --git a/tox.ini b/tox.ini
index 6b266adda460080e797250c2df5b217a3cae3a46..7cd9bec94fbe3b98a78c857481192e4a4aae8109 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = docs,docs-linkcheck,jjb-version,prefix,robot,pylint
+envlist = docs,docs-linkcheck,jjb-version,prefix,robot
 #    pre-commit
 skipsdist = true
 
@@ -16,7 +16,7 @@ commands = sphinx-build -q -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxi
 
 [testenv:jenkins-jobs]
 deps =
-    jenkins-job-builder=={env:JJB_VERSION:4.1.0}
+    jenkins-job-builder=={env:JJB_VERSION:5.0.2}
 commands =
     jenkins-jobs {posargs:--help}