summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------global-jjb0
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg2
-rw-r--r--jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg2
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml2
-rw-r--r--jjb/holmes/holmes-common.yaml5
-rw-r--r--jjb/holmes/holmes-engine-mgt.yaml5
-rw-r--r--jjb/holmes/holmes-rule-mgt.yaml5
-rw-r--r--jjb/integration/integration-macros.yaml1
-rwxr-xr-xjjb/vfc/build-driver-zte-sfc-docker-image.sh11
-rwxr-xr-xjjb/vfc/build-nfvo-catalog-docker-image.sh11
-rw-r--r--jjb/vfc/build-nfvo-multivimproxy-docker-image.sh11
-rwxr-xr-xjjb/vfc/build-nfvo-resmanagement-docker-image.sh11
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml71
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml14
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml72
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml39
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml98
-rw-r--r--jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml14
-rw-r--r--jjb/vfc/vfc-nfvo-multivimproxy.yaml63
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement-csit.yaml14
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml63
m---------packer/common-packer0
-rw-r--r--packer/provision/local-builder.yaml9
-rw-r--r--packer/provision/local-docker.yaml9
25 files changed, 38 insertions, 496 deletions
diff --git a/global-jjb b/global-jjb
-Subproject 89144786dbd6e556bc251aeff6b397d6e28edde
+Subproject 64faafae2362d36e4d5c3e8d5fe6579b9d09cf5
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 7b9af8f46..de51c46fd 100644
--- 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 - 20200219-191621.319
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200720-175313.316
LABELS=ubuntu1804-builder-4c-4g
HARDWARE_ID=v2-highcpu-4
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 c4d05ac87..0743989b7 100644
--- 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 - 20200219-195603.229
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
LABELS=ubuntu1804-docker-8c-8g
HARDWARE_ID=v2-highcpu-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 da8a241ea..3d474c9bd 100644
--- 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 - 20200219-195603.229
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200720-202227.181
LABELS=ubuntu1804-docker-v1-8c-8g
HARDWARE_ID=v1-standard-8
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index 4f5f99764..affa258c4 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -21,6 +21,7 @@
stream:
- 'master':
branch: 'master'
+ java-version: openjdk11
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'dcaegen2-platform-servicechange-handler-settings'
@@ -38,6 +39,7 @@
jobs:
- gerrit-maven-clm
nexus-iq-namespace: 'onap-'
+ java-version: openjdk11
project: dcaegen2/platform/servicechange-handler
build-node: ubuntu1804-docker-8c-8g
project-name: 'dcaegen2-platform-servicechange-handler'
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index 5a3c5cbe3..94f6deffb 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -15,9 +15,10 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ java-version: openjdk11
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
-
+ java-version: openjdk11
project: 'holmes/common'
stream:
- 'master':
@@ -45,6 +46,7 @@
mvn-settings: 'holmes-common-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: holmes-common-clm
@@ -55,6 +57,7 @@
project-name: 'holmes-common'
branch: 'master'
mvn-settings: 'holmes-common-settings'
+ java-version: openjdk11
- project:
name: holmes-common-info
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index c27a6267c..85322581e 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -9,11 +9,14 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ java-version: openjdk11
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1804-docker-8c-8g
+ java-version: openjdk11
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
+ java-version: openjdk11
project: 'holmes/engine-management'
stream:
- 'master':
@@ -43,6 +46,7 @@
mvn-settings: 'holmes-engine-management-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: holmes-engine-management-clm
@@ -53,6 +57,7 @@
project-name: 'holmes-engine-management'
branch: 'master'
mvn-settings: 'holmes-engine-management-settings'
+ java-version: openjdk11
- project:
name: holmes-engine-management-info
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index fee52ac63..9aa9c9dbe 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -9,11 +9,14 @@
sign-artifacts: true
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
+ java-version: openjdk11
- '{project-name}-{stream}-docker-java-daily':
mvn-params: '-Dmaven.test.skip=true'
build-node: ubuntu1804-docker-8c-8g
+ java-version: openjdk11
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
+ java-version: openjdk11
project: 'holmes/rule-management'
stream:
- 'master':
@@ -43,6 +46,7 @@
mvn-settings: 'holmes-rule-management-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ java-version: openjdk11
- project:
name: holmes-rule-management-clm
@@ -53,6 +57,7 @@
project-name: 'holmes-rule-management'
branch: 'master'
mvn-settings: 'holmes-rule-management-settings'
+ java-version: openjdk11
- project:
name: holmes-rule-management-info
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 11680b6b0..10b0437ab 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -65,6 +65,7 @@
vagrant plugin install vagrant-libvirt
vagrant plugin install vagrant-disksize
vagrant plugin install vagrant-sshfs
+ vagrant plugin install vagrant-reload
mkdir -p ~/.ssh
- builder:
diff --git a/jjb/vfc/build-driver-zte-sfc-docker-image.sh b/jjb/vfc/build-driver-zte-sfc-docker-image.sh
deleted file mode 100755
index 8435ae139..000000000
--- a/jjb/vfc/build-driver-zte-sfc-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/*.*
-
-./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh
-
diff --git a/jjb/vfc/build-nfvo-catalog-docker-image.sh b/jjb/vfc/build-nfvo-catalog-docker-image.sh
deleted file mode 100755
index d570d18a2..000000000
--- a/jjb/vfc/build-nfvo-catalog-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./docker/*.*
-
-./docker/build_image.sh
-
diff --git a/jjb/vfc/build-nfvo-multivimproxy-docker-image.sh b/jjb/vfc/build-nfvo-multivimproxy-docker-image.sh
deleted file mode 100644
index d570d18a2..000000000
--- a/jjb/vfc/build-nfvo-multivimproxy-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./docker/*.*
-
-./docker/build_image.sh
-
diff --git a/jjb/vfc/build-nfvo-resmanagement-docker-image.sh b/jjb/vfc/build-nfvo-resmanagement-docker-image.sh
deleted file mode 100755
index 539ea3e52..000000000
--- a/jjb/vfc/build-nfvo-resmanagement-docker-image.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
-
-CURRENTDIR="$(pwd)"
-echo $CURRENTDIR
-
-chmod 755 ./ResmanagementService/docker/*.*
-
-./ResmanagementService/docker/build_image.sh
-
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
deleted file mode 100644
index 0e46c4037..000000000
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-
-- project:
- name: vfc-nfvo-catalog
- project-name: 'vfc-nfvo-catalog'
- project: 'vfc/nfvo/catalog'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-catalog-settings'
- subproject:
- - 'catalog':
- path: '.'
- pattern: '**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-python'
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
- build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
- build-node: centos7-redis-4c-4g
-
-- project:
- name: vfc-nfvo-catalog-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- build-node: centos7-redis-4c-4g
- project: 'vfc/nfvo/catalog'
- project-name: 'vfc-nfvo-catalog'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-catalog-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: vfc-nfvo-catalog-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: vfc/nfvo/catalog
- project-name: 'vfc-nfvo-catalog'
- build-node: centos7-redis-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-catalog-settings'
-
-- project:
- name: vfc-nfvo-catalog-info
- project-name: vfc-nfvo-catalog
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: vfc/nfvo/catalog
- branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
deleted file mode 100644
index 1905012dc..000000000
--- a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: vfc-nfvo-driver-sfc-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-nfvo-driver-sfc'
- recipients: 'yangyanyj@chinamobile.com'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
deleted file mode 100644
index 407a615e1..000000000
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- project:
- name: vfc-nfvo-driver-sfc
- project-name: 'vfc-nfvo-driver-sfc'
- project: 'vfc/nfvo/driver/sfc'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-sfc-settings'
- subproject:
- - 'driver-sfc-zte':
- pom: 'zte/sfc-driver/pom.xml'
- pattern: 'zte/sfc-driver/**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- mvn-pom: 'zte/sfc-driver/pom.xml'
- mvn-params: '-f zte/sfc-driver/pom.xml'
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh'
- build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: vfc-nfvo-driver-sfc-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- mvn-params: '-f zte/sfc-driver/pom.xml'
- build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/nfvo/driver/sfc'
- project-name: 'vfc-nfvo-driver-sfc'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-sfc-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: vfc-nfvo-driver-sfc-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: vfc/nfvo/driver/sfc
- project-name: 'vfc-nfvo-driver-sfc'
- build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-sfc-settings'
-
-- project:
- name: vfc-nfvo-driver-sfc-info
- project-name: vfc-nfvo-driver-sfc
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: vfc/nfvo/driver/sfc
- branch: master
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
deleted file mode 100644
index 0f56d0c7c..000000000
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-
-- project:
- name: vfc-nfvo-driver-vnfm-gvnfm-juju
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
- project: 'vfc/nfvo/driver/vnfm/gvnfm'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
- subproject:
- - 'gvnfm-juju':
- pom: 'juju/juju-vnfmadapter/pom.xml'
- pattern: 'juju/juju-vnfmadapter/**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: vfc-nfvo-driver-vnfm-gvnfm-juju-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- mvn-params: '-f juju/juju-vnfmadapter/pom.xml'
- project: 'vfc/nfvo/driver/vnfm/gvnfm'
- project-name: 'vfc-nfvo-driver-vnfm-gvnfm-juju'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
deleted file mode 100644
index 88607ebf5..000000000
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
----
-- project:
- name: vfc-nfvo-driver-vnfm-svnfm-nokiav2
- project: 'vfc/nfvo/driver/vnfm/svnfm'
- project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
- subproject:
- - 'drv-vnfm-nokiav2':
- pom: 'nokiav2/pom.xml'
- pattern: 'nokiav2/**'
- jobs:
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- mvn-pom: 'nokiav2/pom.xml'
- mvn-params: '-f nokiav2/pom.xml'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- files: 'nokiav2/**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-docker
- project: 'vfc/nfvo/driver/vnfm/svnfm'
- project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
- subproject:
- - 'docker-vnfm-nokiav2':
- pom: 'nokiav2/pom.xml'
- pattern: 'nokiav2/**'
- jobs:
- - '{project-name}-{subproject}-{stream}-verify-docker-cascade-trigger':
- docker_build_args: '--file Dockerfile.verify --build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots'
- docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
- docker_root: '$WORKSPACE/nokiav2/deployment'
- parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-verify-java'
- - '{project-name}-{subproject}-{stream}-merge-docker-cascade-trigger':
- docker_build_args: '--build-arg MODE=-SNAPSHOT --build-arg REPO=snapshots'
- docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
- docker_root: '$WORKSPACE/nokiav2/deployment'
- parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-merge-java'
- - '{project-name}-{subproject}-{stream}-release-version-docker-daily-no-sonar-cascade-trigger':
- docker_build_args: '--build-arg MODE= --build-arg REPO=staging'
- docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
- docker_root: '$WORKSPACE/nokiav2/deployment'
- docker_registry: '$DOCKER_REGISTRY:10003'
- parent_job: '{project-name}-{stream}-drv-vnfm-nokiav2-release-version-java-daily'
-#Since the release is moved manually from the staging repo to the release repo this job can not
-#be triggered in a cascade way
- - '{project-name}-{subproject}-{stream}-release-version-docker-no-sonar':
- docker_build_args: '--build-arg MODE= --build-arg REPO=releases'
- docker_name: 'onap/vfc/nfvo/svnfm/nokiav2'
- docker_root: '$WORKSPACE/nokiav2/deployment'
- docker_registry: '$DOCKER_REGISTRY:10003'
- files: 'nokiav2/**'
- archive-artifacts: ''
- build-node: ubuntu1804-docker-8c-8g
-
-- project:
- name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-sonar
- project: 'vfc/nfvo/driver/vnfm/svnfm'
- project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokiav2'
- cron: '@daily'
- branch: 'master'
- mvn-params: '-f nokiav2/pom.xml'
- mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- build-node: ubuntu1804-builder-4c-4g
-
-- project:
- name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm
- jobs:
- - gerrit-maven-clm:
- mvn-params: '-f nokiav2/pom.xml'
- nexus-iq-namespace: 'onap-'
- project: vfc/nfvo/driver/vnfm/svnfm
- project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
- build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml b/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
deleted file mode 100644
index 6a8377f1b..000000000
--- a/jjb/vfc/vfc-nfvo-multivimproxy-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: vfc-nfvo-multivimproxy-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-nfvo-multivimproxy'
- recipients: 'yangyanyj@chinamobile.com'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-nfvo-multivimproxy-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
deleted file mode 100644
index 16866a8fa..000000000
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-- project:
- name: vfc-nfvo-multivimproxy
- project: 'vfc/nfvo/multivimproxy'
- project-name: 'vfc-nfvo-multivimproxy'
- mvn-settings: 'vfc-nfvo-multivimproxy-settings'
- stream:
- - 'master':
- branch: 'master'
- build-node: ubuntu1804-builder-4c-4g
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-nfvo-multivimproxy-docker-image.sh'
- build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
-- project:
- name: vfc-nfvo-multivimproxy-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/nfvo/multivimproxy'
- project-name: 'vfc-nfvo-multivimproxy'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-multivimproxy-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: vfc-nfvo-multivimproxy-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: vfc/nfvo/multivimproxy
- project-name: 'vfc-nfvo-multivimproxy'
- build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-multivimproxy-settings'
-
-- project:
- name: vfc-nfvo-multivimproxy-info
- project-name: vfc-nfvo-multivimproxy
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: vfc/nfvo/multivimproxy
- branch: master
diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
deleted file mode 100644
index 1534fd5ea..000000000
--- a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
- name: vfc-nfvo-resmanagement-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vfc-nfvo-resmanagement'
- recipients: 'yangyanyj@chinamobile.com'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs: 'vfc-nfvo-resmanagement-master-docker-java-version-shell-daily'
- robot-options: ''
- branch: 'master'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
deleted file mode 100644
index b162ab848..000000000
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-- project:
- name: vfc-nfvo-resmanagement
- project: 'vfc/nfvo/resmanagement'
- project-name: 'vfc-nfvo-resmanagement'
- mvn-settings: 'vfc-nfvo-resmanagement-settings'
- stream:
- - 'master':
- branch: 'master'
- build-node: ubuntu1804-builder-4c-4g
- jobs:
- - '{project-name}-{stream}-verify-java'
- - '{project-name}-{stream}-merge-java'
- - gerrit-maven-stage:
- sign-artifacts: true
- build-node: centos7-builder-4c-4g
- maven-versions-plugin: true
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh'
- build-node: ubuntu1804-docker-8c-8g
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
-
-- project:
- name: vfc-nfvo-resmanagement-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- build-node: ubuntu1804-builder-4c-4g
- project: 'vfc/nfvo/resmanagement'
- project-name: 'vfc-nfvo-resmanagement'
- branch: 'master'
- mvn-settings: 'vfc-nfvo-resmanagement-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
- name: vfc-nfvo-resmanagement-clm
- jobs:
- - gerrit-maven-clm
- nexus-iq-namespace: 'onap-'
- project: vfc/nfvo/resmanagement
- project-name: 'vfc-nfvo-resmanagement'
- build-node: ubuntu1804-builder-4c-4g
- branch: 'master'
- mvn-settings: 'vfc-nfvo-resmanagement-settings'
-
-- project:
- name: vfc-nfvo-resmanagement-info
- project-name: vfc-nfvo-resmanagement
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: vfc/nfvo/resmanagement
- branch: master
diff --git a/packer/common-packer b/packer/common-packer
-Subproject da5d5cf92fafcdc0f31a76d2955e8ac9c327c10
+Subproject 2b8bd41cbf7e3d5faaa90fba9da1a07fdf967ea
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 346098144..077c52f65 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -52,6 +52,15 @@
become: true
when: ansible_distribution == 'Ubuntu'
+ - name: Install Python 3.8
+ apt:
+ name:
+ - python3.8
+ - python3.8-dev
+ - python3.8-tk
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
- name: Install libssl1.0-dev dep
apt:
name: libssl1.0-dev
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 0948cd004..9f590ea48 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -106,6 +106,15 @@
become: true
when: ansible_distribution == 'Ubuntu'
+ - name: Install Python 3.8
+ apt:
+ name:
+ - python3.8
+ - python3.8-dev
+ - python3.8-tk
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
- name: Install nodejs-dev libssl1.0-dev dep
apt:
name: