Merge "Update netconf/master jjb configuration"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index 5fe252337464f1b501b85f537ac3e0ddae734fef..a61802ab65a03588d0106f5f5c683b805198ae5b 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -24,12 +24,6 @@ Following are the list of published images available to Jenkins jobs.
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836
 * ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669
 * ZZCI - CentOS 7 - devstack - x86_64 - 20220401-230107.511
-* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756
-* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200601-190140.080
-* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200801-190141.781
-* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200811-124350.479
-* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20200813-034148.207
-* ZZCI - CentOS 7 - devstack-queens - x86_64 - 20210120-225008.045
 * ZZCI - CentOS 7 - devstack-rocky - 20190601-000116.015
 * ZZCI - CentOS 7 - devstack-rocky - 20190628-065204.973
 * ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559

diff --git a/global-jjb b/global-jjb
index 9915b0bb42077428478e277ed78d1d2016223028..53a8bdfd0f05f7d29ac34a44496efb2ed081250f 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 9915b0bb42077428478e277ed78d1d2016223028
+Subproject commit 53a8bdfd0f05f7d29ac34a44496efb2ed081250f

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 be986aa05d54bf1100ef3dbea0b516fe55f95fcc..931a7be00e5250b04de1abfd65748e0f165d8ce7 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 - 20220811-110452.412
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220830-004905.209
 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 7fa77b03a2c9a18e35265445b27e27f59be1ba34..22646b81e757848532021d5931fe239ae04aecb4 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 - 20220811-110452.412
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220830-004905.209
 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 17e84759a1135e14a1eb3920a248e072f204602d..2ef3d3df6fdd6773d19495fb1d30e62e81eb92aa 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 - 20220811-110452.412
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220830-004905.209
 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 0da5c614cfe2753d9904a6759de8f6c1165bc543..102bf32fdead6696508e0bbc2ad5997518e61320 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 - 20220811-110452.412
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220830-004905.209
 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 fc8b1c8d20b354cf5222684d9efb5a0cbb7be21a..b2e7d6467158ef6410424aa10b0008667de371e8 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 - 20220811-110452.412
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220830-004905.209
 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 68c86077505ae82a87c4f14cde283e72277ea0ed..b05cbfa39caa4a18b71d6f9bf906432588664f1b 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 - 20220811-110452.412
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220830-004905.209
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index bb8dffd6f9b6675b80c6375c797114a580a68eed..89b40a2556476db763c04effd579624412c365b5 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 - 20220811-110452.412
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220830-004905.209
 AVAILABILITY_ZONE=nova
 HARDWARE_ID=v3-standard-2
 NETWORK_ID=b5fcd86e-efac-4997-b8bc-dbe0d35bc229

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index faff0782452b7a6c69ddfe53259eac012f79da19..7e1b5e645e3d8763f4b55a68f7f024b203e2d54f 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -114,7 +114,6 @@
     tools_system_image: "ZZCI - Ubuntu 18.04 - mininet-ovs-28 - x86_64 - 20220801-180111.774"
     openstack_stein_system_image: "ZZCI - CentOS 7 - devstack-stein - x86_64 - 20220811-110634.575"
     openstack_rocky_system_image: "ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20220811-110620.848"
-    openstack_queens_system_image: "ZZCI - CentOS 7 - devstack-queens - x86_64 - 20210120-225008.045"
 
     # Default Robot framework options
     robot-options: ""

diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml
index 8da195a5403377d0828cc1c2de389cdbfa6035d9..9d06ca670f7cd13e2d3313ad37862bf72493a646 100644 (file)
--- a/jjb/transportpce/transportpce.yaml
+++ b/jjb/transportpce/transportpce.yaml
@@ -3,22 +3,22 @@
     name: transportpce-chlorine
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
           project-pattern: transportpce
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-transportpce/47688/
           rtd-token: 6f37ba63226bdcc6c823ee455e62237cf68813fd
       - gerrit-tox-verify:
           build-timeout: 360
-          build-node: centos7-builder-4c-16g
+          build-node: centos8-builder-4c-16g
           parallel: true
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: "transportpce"
     project-name: "transportpce"
     stream: chlorine
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-2c-2g
+    java-version: "openjdk17"
     mvn-settings: "transportpce-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"

diff --git a/packer/provision/mininet-ovs-2.5.yaml b/packer/provision/mininet-ovs-2.5.yaml
deleted file mode 100644 (file)
index 53366c7..0000000
--- a/packer/provision/mininet-ovs-2.5.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-- import_playbook: ../common-packer/provision/baseline.yaml
-
-- hosts: all
-  become_user: root
-  become_method: sudo
-
-  pre_tasks:
-    - include_role: name=lfit.system-update
-
-  tasks:
-    - name: "Install OpenVSwitch {{ovs_version}}"
-      block:
-        - name: "Install dependencies required for OpenVSwitch {{ovs_version}}"
-          apt:
-            name:
-              - dh-autoreconf
-              - debhelper
-              - autoconf
-              - automake
-              - libssl-dev
-              - pkg-config
-              - bzip2
-              - openssl
-              - python-all
-              - procps
-              - python-qt4
-              - python-zopeinterface
-              - python-twisted-conch
-            state: present
-          become: true
-        - name: "Install OpenVSwitch {{ovs_version}}"
-          apt:
-            name:
-              - openvswitch-switch
-              - openvswitch-vtep
-            state: present
-          become: true
-        - name: Enable openvswitch-switch service
-          systemd:
-            name: openvswitch-switch
-            enabled: true
-            masked: false
-          become: true
-        - name: Enable openvswitch-vtep service
-          systemd:
-            name: openvswitch-vtep
-            enabled: true
-            masked: false
-          become: true
-
-    - name: Install Mininet
-      apt: name=mininet state=present
-      become: true
-
-    - name: Install exabgp
-      apt: name=exabgp state=present
-      become: true
-
-    - name: Install vlan for vlan based tests in VTN suites
-      apt: name=vlan state=present
-      become: true
-
-    - name: Install python-netaddr for custom mininet topologies
-      apt: name=python-netaddr state=present
-      become: true
-
-  post_tasks:
-    - name: System Reseal
-      script: ../common-packer/provision/system-reseal.sh
-      become: true

diff --git a/packer/provision/mininet-ovs-2.6.yaml b/packer/provision/mininet-ovs-2.6.yaml
deleted file mode 100644 (file)
index 707f377..0000000
--- a/packer/provision/mininet-ovs-2.6.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
----
-- import_playbook: ../common-packer/provision/baseline.yaml
-
-- hosts: all
-  become_user: root
-  become_method: sudo
-  vars:
-    ovs_version: 2.6.10
-    ovs_checksum: sha256:dc9017013e57e90806a5ee11d5a6b815bc37fab7bec3d713296a16c749c01084
-
-  pre_tasks:
-    - include_role: name=lfit.system-update
-
-  tasks:
-    - name: "Install OpenVSwitch {{ovs_version}}"
-      block:
-        - name: "Install dependencies required for OpenVSwitch {{ovs_version}}"
-          apt:
-            name:
-              - dh-autoreconf
-              - debhelper
-              - autoconf
-              - automake
-              - libssl-dev
-              - pkg-config
-              - bzip2
-              - openssl
-              - python-all
-              - procps
-              - python-qt4
-              - python-zopeinterface
-              - python-twisted-conch
-            state: present
-          become: true
-        - name: Create OVS root
-          file:
-            path: /opt/ovs
-            state: directory
-            mode: 0755
-          become: true
-        - name: "Fetch OpenVSwitch {{ovs_version}} to /tmp"
-          get_url:
-            url: "http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz"
-            dest: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
-            checksum: "{{ovs_checksum}}"
-        - name: "Unarchive OpenVSwitch {{ovs_version}}"
-          unarchive:
-            src: "/tmp/openvswitch-{{ovs_version}}.tar.gz"
-            dest: /opt/ovs
-            remote_src: true
-          become: true
-        - name: "Build OpenVSwitch {{ovs_version}}"
-          shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
-          args:
-            chdir: "/opt/ovs/openvswitch-{{ovs_version}}"
-          become: true
-        - name: "Install OpenVSwitch {{ovs_version}}"
-          apt: "deb={{item}}"
-          with_items:
-            - /opt/ovs/openvswitch-common_{{ovs_version}}-1_amd64.deb
-            - /opt/ovs/openvswitch-switch_{{ovs_version}}-1_amd64.deb
-            - /opt/ovs/python-openvswitch_{{ovs_version}}-1_all.deb
-            - /opt/ovs/openvswitch-vtep_{{ovs_version}}-1_amd64.deb
-          become: true
-        - name: Enable openvswitch-switch service
-          systemd:
-            name: openvswitch-switch
-            enabled: true
-            masked: false
-          become: true
-        - name: Enable openvswitch-vtep service
-          systemd:
-            name: openvswitch-vtep
-            enabled: true
-            masked: false
-          become: true
-
-    - name: Install Mininet
-      apt: name=mininet state=present
-      become: true
-
-    - name: Install exabgp
-      apt: name=exabgp state=present
-      become: true
-
-    - name: Install vlan for vlan based tests in VTN suites
-      apt: name=vlan state=present
-      become: true
-
-    - name: Install python-netaddr for custom mininet topologies
-      apt: name=python-netaddr state=present
-      become: true
-
-  post_tasks:
-    - name: System Reseal
-      script: ../common-packer/provision/system-reseal.sh
-      become: true