Merge "Chore: Move to centos8-builder"

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index 1b3d97c..38f914e 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index 43361f8..a2cdcaa 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
index d8ca726..4567d1e 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211011-195645.572
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220919-201912.261
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index b41ed8f..1dac4ea 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v3-standard-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 284de63..1db2ade 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220829-213803.583
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220919-172301.743
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
index 7232133..8b1e954 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=ubuntu1804-docker-8c-16g
 HARDWARE_ID=v3-standard-16

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index 986d81e..6466685 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
index a137662..1545bbf 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=ubuntu1804-docker-v1-8c-8g
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index 6da3a50..2f7b62a 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220829-213839.699
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220919-172402.717
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
new file mode 100644 (file)
index 0000000..a3c64ce
--- /dev/null
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: ccsdk-odl-legacy-project-view
+    project-name: ccsdk-odl-legacy
+    views:
+      - project-view
+
+- project:
+    name: ccsdk-odl-legacy-info
+    project: ccsdk/odl-legacy
+    project-name: ccsdk-odl-legacy
+    build-node: centos7-builder-2c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file

diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 8f9bc3f..212a061 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -23,6 +23,7 @@
       - compare-type: ANT
         pattern: 'components/slice-analysis-ms/**'
     mvn-snapshot-id: 'ecomp-snapshots'
+    mvn-version: 'mvn36'
     nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
@@ -54,6 +55,7 @@
           branch: 'master'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
+    mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
     gerrit_trigger_file_paths:

diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 0a8303c..36a51fc 100644 (file)
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -7,7 +7,7 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
 - project:
     name: vvp-test-engine-sonar
@@ -35,7 +35,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vvp-test-engine-settings'
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'centos8-builder-4c-4g'
     subproject:
       - 'onap-client':
           path: 'onap-client'

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 1b92859..21af013 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -19,17 +19,6 @@
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox and deps
-      pip:
-        name:
-          - tox
-          - tox-pyenv
-          - virtualenv
-          - more-itertools~=5.0.0
-          - zipp==1.0.0
-        state: present
-      become: true
-
     - name: Install Python 3.6 and packages
       apt:
         name:

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 45fdaf1..32aa2c3 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -61,17 +61,6 @@
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox and deps
-      pip:
-        name:
-          - tox
-          - tox-pyenv
-          - virtualenv
-          - more-itertools~=5.0.0
-          - zipp==1.0.0
-        state: present
-      become: true
-
     - apt_repository:
         repo: ppa:deadsnakes/ppa
         state: present