From 88dcfdb48865876e41ef08131ee1b13602a309e0 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 12 Nov 2019 12:06:49 -0800 Subject: [PATCH] Remove opensuse-150 The opensuse-150 image is being removed as the 15.0 release is EOL. Similar to centos the expectation is that users keep up to date with minor releases. For this we have the opensuse-15 image which should be used instead. Depends-On: https://review.opendev.org/#/c/682844/ Change-Id: I8db99f8f2fd4b1b7b9a5e06148ca2dc185ed682b --- grafana/create-nodepool-dib.sh | 1 - grafana/nodepool-dib.yaml | 44 -------------------------------- grafana/openstack-ansible.yaml | 10 ++++---- nodepool/nl01.openstack.org.yaml | 10 -------- nodepool/nl02.openstack.org.yaml | 19 -------------- nodepool/nl03.openstack.org.yaml | 21 --------------- nodepool/nl04.openstack.org.yaml | 9 ------- nodepool/nodepool.yaml | 24 ----------------- zuul.d/jobs.yaml | 4 +-- 9 files changed, 7 insertions(+), 135 deletions(-) diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index 8e58904a35..46b141fbed 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -24,7 +24,6 @@ create "Fedora 30" "fedora-30" create "Debian Buster" "debian-buster" create "Debian Stretch" "debian-stretch" create "Gentoo" "gentoo-17-0-systemd" -create "openSUSE 15.0" "opensuse-150" create "openSUSE 15.1" "opensuse-15" create "openSUSE Tumbleweed" "opensuse-tumbleweed" create "Ubuntu Bionic arm64" "ubuntu-bionic-arm64" diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index 8b32c1fde5..fb9900b247 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -415,50 +415,6 @@ dashboard: targets: - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.gentoo-17-0-systemd.qcow2.duration.mean, 'None'), "Time") refId: A -# AUTOGENERATED : openSUSE 15.0 - - - title: openSUSE 15.0 - showTitle: true - height: 200px - panels: - - title: Build status - colorBackground: true - type: singlestat - valueName: current - valueMaps: - - value: 0 - text: "OK" - - value: 1 - text: "FAILED" - thresholds: 0.1,0.9 - span: 2 - targets: - - target: "stats.gauges.nodepool.dib_image_build.opensuse-150.qcow2.rc" - valueFontSize: "50%" - - - title: Image size - type: graph - span: 3 - yaxes: - - format: decbytes - min: 0 - - format: decbytes - min: 0 - targets: - - target: aliasByNode(stats.gauges.nodepool.dib_image_build.opensuse-150.*.size, 5) - refId: A - - - title: Build duration - type: graph - span: 3 - yaxes: - - format: ms - min: 0 - - format: ms - min: 0 - targets: - - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.opensuse-150.qcow2.duration.mean, 'None'), "Time") - refId: A # AUTOGENERATED : openSUSE 15.1 - title: openSUSE 15.1 diff --git a/grafana/openstack-ansible.yaml b/grafana/openstack-ansible.yaml index 829a4442ec..b2d8d3c6df 100644 --- a/grafana/openstack-ansible.yaml +++ b/grafana/openstack-ansible.yaml @@ -45,7 +45,7 @@ dashboard: - none targets: - target: alias(scale(averageSeries(stats.timers.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-centos-7.{SUCCESS,FAILURE}.mean), '0.001'), 'Average') - - title: openstack-ansible-openstack-ansible-deploy-aio_lxc-opensuse-150 + - title: openstack-ansible-openstack-ansible-deploy-aio_lxc-opensuse-15 type: graph span: 3 leftYAxisLabel: "time" @@ -53,7 +53,7 @@ dashboard: - s - none targets: - - target: alias(scale(averageSeries(stats.timers.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-150.{SUCCESS,FAILURE}.mean), '0.001'), 'Average') + - target: alias(scale(averageSeries(stats.timers.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-15.{SUCCESS,FAILURE}.mean), '0.001'), 'Average') - title: openstack-ansible check job success rate showTitle: true height: 300px @@ -65,7 +65,7 @@ dashboard: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-xenial.SUCCESS),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-xenial.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-bionic.SUCCESS),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-bionic.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-ubuntu-bionic') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-centos-7.SUCCESS),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-centos-7.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-centos-7') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-150.SUCCESS),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-150.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-150') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-15.SUCCESS),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-15.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-15') - title: openstack-ansible check job failure rate showTitle: true height: 300px @@ -77,7 +77,7 @@ dashboard: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-xenial.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-bionic.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-bionic.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-ubuntu-bionic') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-centos-7.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-centos-7.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-centos-7') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-150.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-150.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-150') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-15.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-15.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-15') - title: openstack-ansible check job timeout rate (Check queue) showTitle: true height: 300px @@ -89,4 +89,4 @@ dashboard: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-xenial.TIMED_OUT),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-xenial.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-bionic.TIMED_OUT),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-ubuntu-bionic.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-ubuntu-bionic') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-centos-7.TIMED_OUT),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-centos-7.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-centos-7') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-150.TIMED_OUT),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-150.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-150') + - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-15.TIMED_OUT),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-15.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-15') diff --git a/nodepool/nl01.openstack.org.yaml b/nodepool/nl01.openstack.org.yaml index 1dad8b2f42..56a624a966 100644 --- a/nodepool/nl01.openstack.org.yaml +++ b/nodepool/nl01.openstack.org.yaml @@ -27,8 +27,6 @@ labels: min-ready: 1 - name: gentoo-17-0-systemd min-ready: 1 - - name: opensuse-150 - min-ready: 1 - name: opensuse-15 min-ready: 1 - name: opensuse-tumbleweed @@ -63,8 +61,6 @@ providers: config-drive: true - name: gentoo-17-0-systemd config-drive: true - - name: opensuse-150 - config-drive: true - name: opensuse-15 config-drive: true - name: opensuse-tumbleweed @@ -114,11 +110,6 @@ providers: flavor-name: 'Performance' diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: 'Performance' - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: 'Performance' @@ -178,7 +169,6 @@ diskimages: - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - - name: opensuse-150 - name: opensuse-15 - name: opensuse-tumbleweed - name: ubuntu-bionic diff --git a/nodepool/nl02.openstack.org.yaml b/nodepool/nl02.openstack.org.yaml index 0eccf0c250..170c502e8c 100644 --- a/nodepool/nl02.openstack.org.yaml +++ b/nodepool/nl02.openstack.org.yaml @@ -20,7 +20,6 @@ labels: - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - - name: opensuse-150 - name: opensuse-15 - name: opensuse-tumbleweed - name: ubuntu-bionic @@ -66,8 +65,6 @@ providers: config-drive: true - name: gentoo-17-0-systemd config-drive: true - - name: opensuse-150 - config-drive: true - name: opensuse-15 config-drive: true - name: opensuse-tumbleweed @@ -121,11 +118,6 @@ providers: flavor-name: '8C-8GB-100GB' diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: '8C-8GB-100GB' - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: '8C-8GB-100GB' @@ -232,11 +224,6 @@ providers: flavor-name: 'nodepool.0' diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: 'nodepool.0' - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: 'nodepool.0' @@ -319,11 +306,6 @@ providers: flavor-name: '8cpu-8GBram-80GBdisk' diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: '8cpu-8GBram-80GBdisk' - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: '8cpu-8GBram-80GBdisk' @@ -401,7 +383,6 @@ diskimages: - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - - name: opensuse-150 - name: opensuse-15 - name: opensuse-tumbleweed - name: ubuntu-bionic diff --git a/nodepool/nl03.openstack.org.yaml b/nodepool/nl03.openstack.org.yaml index 14b06e1285..809ba1288d 100644 --- a/nodepool/nl03.openstack.org.yaml +++ b/nodepool/nl03.openstack.org.yaml @@ -27,7 +27,6 @@ labels: - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - - name: opensuse-150 - name: opensuse-15 - name: opensuse-tumbleweed - name: ubuntu-bionic @@ -78,8 +77,6 @@ providers: config-drive: true - name: gentoo-17-0-systemd config-drive: true - - name: opensuse-150 - config-drive: true - name: opensuse-15 config-drive: true - name: opensuse-tumbleweed @@ -129,11 +126,6 @@ providers: flavor-name: 'A1.8' diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: 'A1.8' - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: 'A1.8' @@ -205,11 +197,6 @@ providers: flavor-name: 'osf-highcpu-8' diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: 'osf-highcpu-8' - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: 'osf-highcpu-8' @@ -323,13 +310,6 @@ providers: volume-size: 80 diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: v2-highcpu-8 - boot-from-volume: true - volume-size: 80 - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: v2-highcpu-8 @@ -461,7 +441,6 @@ diskimages: - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - - name: opensuse-150 - name: opensuse-15 - name: opensuse-tumbleweed - name: ubuntu-bionic diff --git a/nodepool/nl04.openstack.org.yaml b/nodepool/nl04.openstack.org.yaml index fbe09ec6c3..36c83adc93 100644 --- a/nodepool/nl04.openstack.org.yaml +++ b/nodepool/nl04.openstack.org.yaml @@ -20,7 +20,6 @@ labels: - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - - name: opensuse-150 - name: opensuse-15 - name: opensuse-tumbleweed - name: ubuntu-bionic @@ -49,8 +48,6 @@ providers: config-drive: true - name: gentoo-17-0-systemd config-drive: true - - name: opensuse-150 - config-drive: true - name: opensuse-15 config-drive: true - name: opensuse-tumbleweed @@ -100,11 +97,6 @@ providers: flavor-name: ssd-osFoundation-3 diskimage: gentoo-17-0-systemd key-name: infra-root-keys-2018-06-15 - - name: opensuse-150 - min-ram: 8000 - flavor-name: ssd-osFoundation-3 - diskimage: opensuse-150 - key-name: infra-root-keys-2018-06-15 - name: opensuse-15 min-ram: 8000 flavor-name: ssd-osFoundation-3 @@ -151,7 +143,6 @@ diskimages: - name: fedora-29 - name: fedora-30 - name: gentoo-17-0-systemd - - name: opensuse-150 - name: opensuse-15 - name: opensuse-tumbleweed - name: ubuntu-bionic diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml index 02cc1c3b1b..6e5b9d3069 100644 --- a/nodepool/nodepool.yaml +++ b/nodepool/nodepool.yaml @@ -49,8 +49,6 @@ providers: config-drive: true - name: gentoo-17-0-systemd config-drive: true - - name: opensuse-150 - config-drive: true - name: opensuse-15 config-drive: true - name: opensuse-tumbleweed @@ -285,28 +283,6 @@ diskimages: GIT_HTTP_LOW_SPEED_TIME: '300' GIT_HTTP_LOW_SPEED_LIMIT: '1000' DIB_SHOW_IMAGE_USAGE: '1' - - name: opensuse-150 - pause: false - elements: - - opensuse-minimal - - vm - - simple-init - - openstack-repos - - nodepool-base - - cache-devstack - - growroot - - infra-package-needs - release: '15.0' - env-vars: - TMPDIR: /opt/dib_tmp - DIB_CHECKSUM: '1' - DIB_IMAGE_CACHE: /opt/dib_cache - DIB_JOURNAL_SIZE: '512' - DIB_GRUB_TIMEOUT: '0' - DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.openstack.org/opensuse' - GIT_HTTP_LOW_SPEED_TIME: '300' - GIT_HTTP_LOW_SPEED_LIMIT: '1000' - DIB_SHOW_IMAGE_USAGE: '1' - name: opensuse-15 pause: false elements: diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 51eb2e6f55..4abfa2a899 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1207,8 +1207,8 @@ Check installation of binary packages for file nodepool/elements/bindep-fallback.txt. - The testing is done for openSUSE Leap 15.0. - nodeset: opensuse-150 + The testing is done for openSUSE Leap 15. + nodeset: opensuse-15 - job: name: project-config-bindep-fallback-ubuntu-trusty