From f84aaf60948f64644ce7bd13492ff9df8d667271 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 12 Mar 2020 13:34:56 -0700 Subject: [PATCH] Update packer builds - Memcached does not need centos nodes anymore Switch to Ubuntu18.04 - Helm switch to Ubuntu18.04 Change-Id: I87a8b17832757433643de217aad5d32e30ecc24e Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall --- jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg | 3 --- jjb/ci-management/ci-management-packer-jobs.yaml | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg diff --git a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg deleted file mode 100644 index d757901bb..000000000 --- a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=CentOS 7 - memcached - - 260980909-9003 -LABELS=centos7-memcached-4c-4g -HARDWARE_ID=v2-highcpu-4 diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 2a8436f69..6f402926b 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -52,8 +52,7 @@ build-timeout: 90 platforms: - - centos-7 - - ubuntu-16.04 + - ubuntu-18.04 templates: memcached - project: @@ -85,6 +84,5 @@ build-node: centos7-builder-2c-1g platforms: - - ubuntu-16.04 - ubuntu-18.04 templates: helm -- 2.16.6