Merge "[DCAE] Set mvn to 3.6 for slice-Ms"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Tue, 27 Sep 2022 18:14:37 +0000 (18:14 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 27 Sep 2022 18:14:37 +0000 (18:14 +0000)
29 files changed:
jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg [deleted file]
jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-16g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-v1-8c-8g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/cattle/ubuntu2004-memcached-4c-4g.cfg [new file with mode: 0644]
jjb/ccsdk/odl-legacy.yaml [new file with mode: 0644]
jjb/ci-management/ci-management-packer-jobs.yaml
jjb/modeling/modeling-etsicatalog.yaml
jjb/multicloud/multicloud-openstack.yaml
jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
jjb/vfc/vfc-nfvo-lcm-java.yaml
packer/provision/local-builder.yaml
packer/provision/local-docker.yaml

index 1b3d97c..38f914e 100644 (file)
@@ -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
index 43361f8..a2cdcaa 100644 (file)
@@ -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
index d8ca726..4567d1e 100644 (file)
@@ -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/centos7-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-redis-4c-4g.cfg
deleted file mode 100644 (file)
index f72d6cc..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=CentOS 7 - redis -  - 50880808-8011
-LABELS=centos7-redis-4c-4g
-HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg
new file mode 100644 (file)
index 0000000..fd17849
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220915-231836.003
+LABELS=centos8-builder-2c-1g
+HARDWARE_ID=v3-standard-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg
new file mode 100644 (file)
index 0000000..c723803
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220915-231836.003
+LABELS=centos8-builder-4c-4g
+HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
new file mode 100644 (file)
index 0000000..b58f8dc
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20220912-171155.418
+LABELS=centos8-docker-8c-8g
+HARDWARE_ID=v3-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg
new file mode 100644 (file)
index 0000000..0c5f296
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=CentOS Stream 8 - redis -  - 150980909-9011
+LABELS=centos8-redis-4c-4g
+HARDWARE_ID=v3-standard-4
index b41ed8f..1dac4ea 100644 (file)
@@ -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
index 284de63..1db2ade 100644 (file)
@@ -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
index 7232133..8b1e954 100644 (file)
@@ -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
index 986d81e..6466685 100644 (file)
@@ -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
index a137662..1545bbf 100644 (file)
@@ -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
index 6da3a50..2f7b62a 100644 (file)
@@ -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/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
deleted file mode 100644 (file)
index e4aac19..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120780707-7003
-LABELS=ubuntu1804-memcached-4c-4g
-HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
new file mode 100644 (file)
index 0000000..6055f86
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20220912-175229.141
+LABELS=ubuntu2004-builder-4c-4g
+HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-16g.cfg
new file mode 100644 (file)
index 0000000..25448aa
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20220912-171230.906
+LABELS=ubuntu2004-docker-8c-16g
+HARDWARE_ID=v3-standard-16
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-8c-8g.cfg
new file mode 100644 (file)
index 0000000..ca7e6fe
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20220912-171230.906
+LABELS=ubuntu2004-docker-8c-8g
+HARDWARE_ID=v3-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-docker-v1-8c-8g.cfg
new file mode 100644 (file)
index 0000000..bbe73dd
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - docker - x86_64 - 20220912-171230.906
+LABELS=ubuntu2004-docker-v1-8c-8g
+HARDWARE_ID=v3-standard-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-helm-2c-1g.cfg
new file mode 100644 (file)
index 0000000..a7eab68
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - helm - x86_64 - 20220907-184211.729
+LABELS=ubuntu2004-helm-2c-1g
+HARDWARE_ID=v3-standard-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-memcached-4c-4g.cfg
new file mode 100644 (file)
index 0000000..163b624
--- /dev/null
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 20.04 - memcached - x86_64 - 70980909-9002
+LABELS=ubuntu2004-memcached-4c-4g
+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
@@ -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
index 1b41e92..74c9f96 100644 (file)
@@ -15,7 +15,7 @@
 
     platforms:
       - centos-7
-      - centos-8
+      - centos-cs-8
       - ubuntu-18.04
       - ubuntu-20.04
     templates: builder
@@ -37,7 +37,7 @@
 
     platforms:
       - centos-7
-      - centos-8
+      - centos-cs-8
       - ubuntu-18.04-arm64
       - ubuntu-18.04
       - ubuntu-20.04
@@ -80,7 +80,7 @@
 
     platforms:
       - centos-7
-      - centos-8
+      - centos-cs-8
     templates: redis
     update-cloud-image: true
 
index 5bea13d..8dead6d 100644 (file)
@@ -57,7 +57,7 @@
     nexus-iq-namespace: 'onap-'
     project: modeling/etsicatalog
     project-name: 'modeling-etsicatalog'
-    build-node: centos7-redis-4c-4g
+    build-node: centos8-redis-4c-4g
     branch: 'master'
     mvn-settings: 'modeling-etsicatalog-settings'
 
index a38f5eb..f78ca6d 100644 (file)
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack
     project-name: 'multicloud-openstack'
-    build-node: ubuntu1804-memcached-4c-4g
+    build-node: ubuntu2004-memcached-4c-4g
     stream:
       - 'master':
           branch: 'master'
index 13c0955..589a7ad 100644 (file)
@@ -34,7 +34,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-redis-4c-4g
+    build-node: centos8-redis-4c-4g
 
 - project:
     name: vfc-gvnfm-vnflcm-lcm-sonar
@@ -62,7 +62,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/gvnfm/vnflcm
     project-name: 'vfc-gvnfm-vnflcm'
-    build-node: centos7-redis-4c-4g
+    build-node: centos8-redis-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
 
index 4fe8a6d..89726b4 100644 (file)
@@ -24,7 +24,7 @@
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: centos7-redis-4c-4g
+    build-node: centos8-redis-4c-4g
 
 - project:
     name: vfc-nfvo-lcm-sonar
@@ -51,7 +51,7 @@
     nexus-iq-namespace: 'onap-'
     project: vfc/nfvo/lcm
     project-name: 'vfc-nfvo-lcm'
-    build-node: centos7-redis-4c-4g
+    build-node: centos8-redis-4c-4g
     branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
 
index fa1038d..21af013 100644 (file)
       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:
@@ -95,7 +84,7 @@
       become: true
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
-    - name: Install base packages
+    - name: Install supporting packages (Ubuntu 18.04)
       apt:
         name:
           - unzip
           - crudini
           - maven
           - python-ncclient
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install supporting packages (Ubuntu 20.04)
+      apt:
+        name:
+          - unzip
+          - xz-utils
+          - libxml-xpath-perl
+          - wget
+          - make
+          - sshuttle
+          - netcat
+          - libssl-dev
+          - libffi-dev
           - xmlstarlet
           - xvfb
           - crudini
           - maven
-          - python-ncclient
+          - python3-ncclient
         update_cache: yes
+        state: fixed
       become: true
-      when: ansible_distribution == 'Ubuntu'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
     - name: Install npm and addon packages
       apt:
index 0d0d86c..32aa2c3 100644 (file)
       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
       become: true
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
-    - name: Install supporting packages
+    - name: Install supporting packages (Ubuntu 18.04)
       apt:
         name:
           - unzip
           - crudini
           - maven
           - python-ncclient
+        update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install supporting packages (Ubuntu 20.04)
+      apt:
+        name:
+          - unzip
+          - xz-utils
+          - libxml-xpath-perl
+          - wget
+          - make
+          - sshuttle
+          - netcat
+          - libssl-dev
+          - libffi-dev
           - xmlstarlet
           - xvfb
           - crudini
           - maven
-          - python-ncclient
+          - python3-ncclient
         update_cache: yes
         state: fixed
       become: true
-      when: ansible_distribution == 'Ubuntu'
+      when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
 
     - name: Install npm and addon packages
       apt:
     - name: npm self-update
       command: npm install npm@{{ npm_version }} -g
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: npm install n module
       command: npm install n -g
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Upgrade latest stable node version
       command: n stable | PATH="$PATH"
       become: true
+      when: ansible_distribution == 'Ubuntu'
 
     - name: Add Google Chrome key
       apt_key:
     - name: Install Erlang dependency packages
       apt:
         name:
-          - libwxgtk3.0-0v5
           - libsctp1
           - libwxbase3.0-0v5
       become: true
       when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'
 
+    - name: Install Erlang dependency package libwxgtk3 for 18.04
+      apt:
+        name:
+          - libwxgtk3.0-0v5
+      become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'
+
+    - name: Install Erlang dependency package libwxgtk3 for 20.04
+      apt:
+        name:
+          - libwxgtk3.0-gtk3-0v5
+      become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
+
+    - name: Download and install libssl Ubuntu 20.04
+      apt:
+        deb: http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.10_amd64.deb
+      become: true
+      when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04'
+
     - name: Install Erlang
       apt:
-        deb: https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_19.3.6-1~ubuntu~trusty_amd64.deb
+        deb: https://packages.erlang-solutions.com/erlang/debian/pool/esl-erlang_24.1-1~ubuntu~trusty_amd64.deb
       become: true
       when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu'