From d175e5c6e78e1f80b0b3eb85069e7776cd329470 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 12 Mar 2020 15:57:25 -0700 Subject: [PATCH] Migrate memcached jobs to 18.04 Add build node Ubuntu 18.04 memcached Migrate memcahced jobs to Ubuntu 18.04 Change-Id: I4b51a7e2e21dbf515a22f9b2e6c56b444b3bc247 Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall --- jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg | 3 --- jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg | 3 +++ jjb/multicloud/multicloud-openstack.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg create mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg deleted file mode 100644 index 11e0fbbc2..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=Ubuntu 16.04 - memcached - - 211081010-10003 -LABELS=ubuntu1604-memcached-4c-4g -HARDWARE_ID=v2-highcpu-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 new file mode 100644 index 000000000..6d2f06e38 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=Ubuntu 18.04 - memcached - - 120380303-3010 +LABELS=ubuntu1804-memcached-4c-4g +HARDWARE_ID=v2-highcpu-4 diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 1bdc5b9bc..6d02177d8 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -160,7 +160,7 @@ nexus-iq-namespace: 'onap-' project: multicloud/openstack project-name: 'multicloud-openstack' - build-node: ubuntu1604-memcached-4c-4g + build-node: ubuntu1804-memcached-4c-4g branch: 'master' mvn-settings: 'multicloud-openstack-settings' -- 2.16.6