From d1a1fe920370f553d7551d325e2ff21a437767ac Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 14 Oct 2019 09:14:08 -0700 Subject: [PATCH] Remove references to OpenSUSE 423 This nodeset is no longer in use, remove references to it. Change-Id: I5ac0f5ee7b8f18acfd9726e0fcec1c67bedde32d --- grafana/create-nodepool-dib.sh | 1 - grafana/nodepool-dib.base.template | 2 +- grafana/nodepool-dib.yaml | 46 +-------------------------- grafana/openstack-ansible.yaml | 12 ------- grafana/tempest.yaml | 1 - nodepool/elements/bindep-fallback.txt | 3 +- 6 files changed, 3 insertions(+), 62 deletions(-) diff --git a/grafana/create-nodepool-dib.sh b/grafana/create-nodepool-dib.sh index ba0ba8e21a..8e58904a35 100755 --- a/grafana/create-nodepool-dib.sh +++ b/grafana/create-nodepool-dib.sh @@ -27,7 +27,6 @@ create "Gentoo" "gentoo-17-0-systemd" create "openSUSE 15.0" "opensuse-150" create "openSUSE 15.1" "opensuse-15" create "openSUSE Tumbleweed" "opensuse-tumbleweed" -create "openSUSE 42.3" "opensuse-423" create "Ubuntu Bionic arm64" "ubuntu-bionic-arm64" create "Ubuntu Xenial arm64" "ubuntu-xenial-arm64" diff --git a/grafana/nodepool-dib.base.template b/grafana/nodepool-dib.base.template index 1bcba793a3..0296f69fd8 100644 --- a/grafana/nodepool-dib.base.template +++ b/grafana/nodepool-dib.base.template @@ -1,5 +1,5 @@ # -# NOTE: This file is autogenerated. Use ./create-dib.sh to +# NOTE: This file is autogenerated. Use ./create-nodepool-dib.sh to # recreate it # diff --git a/grafana/nodepool-dib.yaml b/grafana/nodepool-dib.yaml index 92c2ac1817..8b32c1fde5 100644 --- a/grafana/nodepool-dib.yaml +++ b/grafana/nodepool-dib.yaml @@ -1,5 +1,5 @@ # -# NOTE: This file is autogenerated. Use ./create-dib.sh to +# NOTE: This file is autogenerated. Use ./create-nodepool-dib.sh to # recreate it # @@ -547,50 +547,6 @@ dashboard: targets: - target: alias(keepLastValue(stats.timers.nodepool.dib_image_build.opensuse-tumbleweed.qcow2.duration.mean, 'None'), "Time") refId: A -# AUTOGENERATED : openSUSE 42.3 - - - title: openSUSE 42.3 - 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-423.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-423.*.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-423.qcow2.duration.mean, 'None'), "Time") - refId: A # AUTOGENERATED : Ubuntu Bionic arm64 - title: Ubuntu Bionic arm64 diff --git a/grafana/openstack-ansible.yaml b/grafana/openstack-ansible.yaml index 2f85f94d79..829a4442ec 100644 --- a/grafana/openstack-ansible.yaml +++ b/grafana/openstack-ansible.yaml @@ -45,15 +45,6 @@ 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-423 - type: graph - span: 3 - leftYAxisLabel: "time" - y_formats: - - 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-423.{SUCCESS,FAILURE}.mean), '0.001'), 'Average') - title: openstack-ansible-openstack-ansible-deploy-aio_lxc-opensuse-150 type: graph span: 3 @@ -74,7 +65,6 @@ 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-423.SUCCESS),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-423.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-423') - 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') - title: openstack-ansible check job failure rate showTitle: true @@ -87,7 +77,6 @@ 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-423.FAILURE),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-423.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-423') - 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') - title: openstack-ansible check job timeout rate (Check queue) showTitle: true @@ -100,5 +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-423.TIMED_OUT),sum(stats_counts.zuul.tenant.openstack.pipeline.check.project.opendev_org.openstack_openstack-ansible.master.job.openstack-ansible-deploy-aio_lxc-opensuse-423.{SUCCESS,FAILURE,TIMED_OUT})),'24hours'), 'openstack-ansible-deploy-aio_lxc-opensuse-423') - 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') diff --git a/grafana/tempest.yaml b/grafana/tempest.yaml index 53d5b33d8a..8ce70ca0bb 100644 --- a/grafana/tempest.yaml +++ b/grafana/tempest.yaml @@ -27,5 +27,4 @@ dashboard: - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-ubuntu-xenial.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-full-ubuntu-xenial') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-multinode-full-ubuntu-xenial-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-multinode-full-ubuntu-xenial-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-multinode-full-ubuntu-xenial-nv') - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-centos-7-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-centos-7-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-full-centos-7-nv') - - target: alias(movingAverage(asPercent(transformNull(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-opensuse-423-nv.FAILURE),sum(stats_counts.zuul.pipeline.check.job.gate-tempest-dsvm-neutron-full-opensuse-423-nv.{SUCCESS,FAILURE})),'24hours'), 'gate-tempest-dsvm-neutron-full-opensuse-423-nv') type: graph diff --git a/nodepool/elements/bindep-fallback.txt b/nodepool/elements/bindep-fallback.txt index bc4c3d7d45..4d526031a9 100644 --- a/nodepool/elements/bindep-fallback.txt +++ b/nodepool/elements/bindep-fallback.txt @@ -24,8 +24,7 @@ libevent-dev [platform:dpkg] libevent-devel [platform:rpm] dev-libs/libevent [platform:gentoo] libffi-dev [platform:dpkg] -libffi-devel [platform:redhat platform:suse !platform:opensuse423] -libffi48-devel [platform:opensuse423] +libffi-devel [platform:redhat platform:suse] virtual/libffi [platform:gentoo] libjerasure-dev [platform:ubuntu] dev-libs/jerasure [platform:gentoo]