Merge "Create jobs fot netconf-server."

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 d3cd46a..e93c0d4 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 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 INSTANCE_CAP=1

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 7ad0f8a..753d836 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,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
 LABELS=ubuntu1804-docker-8c-16g
 HARDWARE_ID=v2-highcpu-16
 VOLUME_SIZE=40

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 b2c8e2b..6a653df 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,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v2-highcpu-8
 VOLUME_SIZE=20

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 2be74d1..4b870b2 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,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210223-063615.366
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
 LABELS=ubuntu1804-docker-v1-8c-8g
 HARDWARE_ID=v1-standard-8
 VOLUME_SIZE=50

diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index b523801..292224b 100644 (file)
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -14,7 +14,7 @@
                 build-node: ubuntu1804-docker-8c-8g
                 container-public-registry: 'nexus3.onap.org:10001'
                 container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean install -P docker'
+                mvn-goals: 'clean install -P docker -DskipDockerPush=false'
           - '{project-name}-gerrit-release-jobs':
                 build-node: centos7-docker-8c-8g