From d10f7e5e8f1605c0b5ebbe176f429d3f23d636a5 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Fri, 31 Jul 2020 12:06:13 -0400 Subject: [PATCH] Use vexxhost-specific labels Change-Id: I9a3e1669195997fd347b8662c754f30feb97179d --- hack/update-zuul-jobs.py | 11 ++++++ images/glance/requirements.txt | 4 +-- zuul.d/ceilometer-jobs.yaml | 18 ++++++---- zuul.d/functional-jobs.yaml | 56 +++++++++++++++-------------- zuul.d/glance-jobs.yaml | 18 ++++++---- zuul.d/heat-jobs.yaml | 18 ++++++---- zuul.d/horizon-jobs.yaml | 18 ++++++---- zuul.d/keystone-jobs.yaml | 18 ++++++---- zuul.d/magnum-jobs.yaml | 18 ++++++---- zuul.d/mcrouter-exporter-jobs.yaml | 18 ++++++---- zuul.d/mcrouter-jobs.yaml | 18 ++++++---- zuul.d/memcached-exporter-jobs.yaml | 18 ++++++---- zuul.d/memcached-jobs.yaml | 18 ++++++---- zuul.d/openstack-operator-jobs.yaml | 12 +++++-- zuul.d/rabbitmq-jobs.yaml | 18 ++++++---- 15 files changed, 184 insertions(+), 97 deletions(-) diff --git a/hack/update-zuul-jobs.py b/hack/update-zuul-jobs.py index d3189e8a..08ae4b6e 100755 --- a/hack/update-zuul-jobs.py +++ b/hack/update-zuul-jobs.py @@ -34,6 +34,14 @@ for image in images: files = ['^images/%s/.*' % image] build_deps = ['openstack-operator:images:build:openstack-operator'] upload_deps = ['openstack-operator:images:upload:openstack-operator'] + nodeset = { + 'nodes': [ + { + 'name': 'ubuntu-bionic', + 'label': 'ubuntu-bionic-vexxhost', + } + ] + } job_vars = { 'docker_images': [ @@ -73,6 +81,7 @@ for image in images: 'name': 'openstack-operator:images:build:%s' % image, 'parent': 'vexxhost-build-docker-image', 'provides': 'openstack-operator:image:%s' % image, + 'nodeset': nodeset, 'vars': job_vars, } } @@ -82,6 +91,7 @@ for image in images: 'name': 'openstack-operator:images:upload:%s' % image, 'parent': 'vexxhost-upload-docker-image', 'provides': 'openstack-operator:image:%s' % image, + 'nodeset': nodeset, 'vars': job_vars, } } @@ -94,6 +104,7 @@ for image in images: 'job': { 'name': 'openstack-operator:images:promote:%s' % image, 'parent': 'vexxhost-promote-docker-image', + 'nodeset': nodeset, 'vars': job_vars, } } diff --git a/images/glance/requirements.txt b/images/glance/requirements.txt index 6cbda581..326f700c 100644 --- a/images/glance/requirements.txt +++ b/images/glance/requirements.txt @@ -3,5 +3,5 @@ boto3 PyMySQL python-memcached git+https://opendev.org/openstack/glance@stable/ussuri -https://github.com/ceph/ceph/archive/octopus.tar.gz#egg=rados&subdirectory=src/pybind/rados -https://github.com/ceph/ceph/archive/octopus.tar.gz#egg=rbd&subdirectory=src/pybind/rbd \ No newline at end of file +https://github.com/ceph/ceph/archive/v15.2.4.tar.gz#egg=rados&subdirectory=src/pybind/rados +https://github.com/ceph/ceph/archive/v15.2.4.tar.gz#egg=rbd&subdirectory=src/pybind/rbd diff --git a/zuul.d/ceilometer-jobs.yaml b/zuul.d/ceilometer-jobs.yaml index 01a149bb..91a9c3a3 100644 --- a/zuul.d/ceilometer-jobs.yaml +++ b/zuul.d/ceilometer-jobs.yaml @@ -2,7 +2,11 @@ name: openstack-operator:images:build:ceilometer parent: vexxhost-build-docker-image provides: openstack-operator:image:ceilometer - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/ceilometer repository: vexxhost/ceilometer @@ -12,21 +16,23 @@ target: ceilometer-agent-notification dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/ceilometer/.* - job: name: openstack-operator:images:upload:ceilometer parent: vexxhost-upload-docker-image provides: openstack-operator:image:ceilometer - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:ceilometer parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/functional-jobs.yaml b/zuul.d/functional-jobs.yaml index c2f26f66..f9a847aa 100644 --- a/zuul.d/functional-jobs.yaml +++ b/zuul.d/functional-jobs.yaml @@ -14,6 +14,10 @@ - openstack/magnum-tempest-plugin - openstack/horizon - openstack/tempest-horizon + nodeset: + nodes: + - name: controller + label: ubuntu-bionic-expanded-vexxhost vars: devstack_services: etcd3: false @@ -46,53 +50,53 @@ jobs: - openstack-operator:functional: dependencies: - - name: openstack-operator:images:build:mcrouter-exporter - soft: true - - name: openstack-operator:images:build:horizon - soft: true - - name: openstack-operator:images:build:magnum - soft: true - - name: openstack-operator:images:build:glance - soft: true - - name: openstack-operator:images:build:rabbitmq + - name: openstack-operator:images:build:heat soft: true - name: openstack-operator:images:build:ceilometer soft: true - - name: openstack-operator:images:build:memcached-exporter - soft: true - - name: openstack-operator:images:build:memcached + - name: openstack-operator:images:build:rabbitmq soft: true - name: openstack-operator:images:build:keystone soft: true + - name: openstack-operator:images:build:horizon + soft: true + - name: openstack-operator:images:build:memcached + soft: true - name: openstack-operator:images:build:mcrouter soft: true - openstack-operator:images:build:openstack-operator - - name: openstack-operator:images:build:heat + - name: openstack-operator:images:build:glance + soft: true + - name: openstack-operator:images:build:mcrouter-exporter + soft: true + - name: openstack-operator:images:build:memcached-exporter + soft: true + - name: openstack-operator:images:build:magnum soft: true gate: jobs: - openstack-operator:functional: dependencies: - - name: openstack-operator:images:upload:mcrouter-exporter - soft: true - - name: openstack-operator:images:upload:horizon - soft: true - - name: openstack-operator:images:upload:magnum - soft: true - - name: openstack-operator:images:upload:glance - soft: true - - name: openstack-operator:images:upload:rabbitmq + - name: openstack-operator:images:upload:heat soft: true - name: openstack-operator:images:upload:ceilometer soft: true - - name: openstack-operator:images:upload:memcached-exporter - soft: true - - name: openstack-operator:images:upload:memcached + - name: openstack-operator:images:upload:rabbitmq soft: true - name: openstack-operator:images:upload:keystone soft: true + - name: openstack-operator:images:upload:horizon + soft: true + - name: openstack-operator:images:upload:memcached + soft: true - name: openstack-operator:images:upload:mcrouter soft: true - openstack-operator:images:upload:openstack-operator - - name: openstack-operator:images:upload:heat + - name: openstack-operator:images:upload:glance + soft: true + - name: openstack-operator:images:upload:mcrouter-exporter + soft: true + - name: openstack-operator:images:upload:memcached-exporter + soft: true + - name: openstack-operator:images:upload:magnum soft: true diff --git a/zuul.d/glance-jobs.yaml b/zuul.d/glance-jobs.yaml index 90b72f78..f0b0f870 100644 --- a/zuul.d/glance-jobs.yaml +++ b/zuul.d/glance-jobs.yaml @@ -2,28 +2,34 @@ name: openstack-operator:images:build:glance parent: vexxhost-build-docker-image provides: openstack-operator:image:glance - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/glance repository: vexxhost/glance-api target: glance-api dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/glance/.* - job: name: openstack-operator:images:upload:glance parent: vexxhost-upload-docker-image provides: openstack-operator:image:glance - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:glance parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/heat-jobs.yaml b/zuul.d/heat-jobs.yaml index 426ac815..4a3d8e00 100644 --- a/zuul.d/heat-jobs.yaml +++ b/zuul.d/heat-jobs.yaml @@ -2,7 +2,11 @@ name: openstack-operator:images:build:heat parent: vexxhost-build-docker-image provides: openstack-operator:image:heat - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/heat repository: vexxhost/heat-api-base @@ -18,21 +22,23 @@ target: heat-engine dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/heat/.* - job: name: openstack-operator:images:upload:heat parent: vexxhost-upload-docker-image provides: openstack-operator:image:heat - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:heat parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/horizon-jobs.yaml b/zuul.d/horizon-jobs.yaml index 839277b4..6c9f5683 100644 --- a/zuul.d/horizon-jobs.yaml +++ b/zuul.d/horizon-jobs.yaml @@ -2,27 +2,33 @@ name: openstack-operator:images:build:horizon parent: vexxhost-build-docker-image provides: openstack-operator:image:horizon - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/horizon repository: vexxhost/horizon dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/horizon/.* - job: name: openstack-operator:images:upload:horizon parent: vexxhost-upload-docker-image provides: openstack-operator:image:horizon - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:horizon parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/keystone-jobs.yaml b/zuul.d/keystone-jobs.yaml index 43bb0f7b..0b53835b 100644 --- a/zuul.d/keystone-jobs.yaml +++ b/zuul.d/keystone-jobs.yaml @@ -2,27 +2,33 @@ name: openstack-operator:images:build:keystone parent: vexxhost-build-docker-image provides: openstack-operator:image:keystone - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/keystone repository: vexxhost/keystone dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/keystone/.* - job: name: openstack-operator:images:upload:keystone parent: vexxhost-upload-docker-image provides: openstack-operator:image:keystone - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:keystone parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/magnum-jobs.yaml b/zuul.d/magnum-jobs.yaml index 79ef301c..cb343257 100644 --- a/zuul.d/magnum-jobs.yaml +++ b/zuul.d/magnum-jobs.yaml @@ -2,7 +2,11 @@ name: openstack-operator:images:build:magnum parent: vexxhost-build-docker-image provides: openstack-operator:image:magnum - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/magnum repository: vexxhost/magnum-api @@ -12,21 +16,23 @@ target: magnum-conductor dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/magnum/.* - job: name: openstack-operator:images:upload:magnum parent: vexxhost-upload-docker-image provides: openstack-operator:image:magnum - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:magnum parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/mcrouter-exporter-jobs.yaml b/zuul.d/mcrouter-exporter-jobs.yaml index ca5ff2e7..e84d6456 100644 --- a/zuul.d/mcrouter-exporter-jobs.yaml +++ b/zuul.d/mcrouter-exporter-jobs.yaml @@ -2,27 +2,33 @@ name: openstack-operator:images:build:mcrouter-exporter parent: vexxhost-build-docker-image provides: openstack-operator:image:mcrouter-exporter - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/mcrouter-exporter repository: vexxhost/mcrouter-exporter dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/mcrouter-exporter/.* - job: name: openstack-operator:images:upload:mcrouter-exporter parent: vexxhost-upload-docker-image provides: openstack-operator:image:mcrouter-exporter - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:mcrouter-exporter parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/mcrouter-jobs.yaml b/zuul.d/mcrouter-jobs.yaml index 18601986..3f9483b3 100644 --- a/zuul.d/mcrouter-jobs.yaml +++ b/zuul.d/mcrouter-jobs.yaml @@ -2,27 +2,33 @@ name: openstack-operator:images:build:mcrouter parent: vexxhost-build-docker-image provides: openstack-operator:image:mcrouter - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/mcrouter repository: vexxhost/mcrouter dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/mcrouter/.* - job: name: openstack-operator:images:upload:mcrouter parent: vexxhost-upload-docker-image provides: openstack-operator:image:mcrouter - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:mcrouter parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/memcached-exporter-jobs.yaml b/zuul.d/memcached-exporter-jobs.yaml index fbc8347b..65bf3f6d 100644 --- a/zuul.d/memcached-exporter-jobs.yaml +++ b/zuul.d/memcached-exporter-jobs.yaml @@ -2,27 +2,33 @@ name: openstack-operator:images:build:memcached-exporter parent: vexxhost-build-docker-image provides: openstack-operator:image:memcached-exporter - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/memcached-exporter repository: vexxhost/memcached-exporter dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/memcached-exporter/.* - job: name: openstack-operator:images:upload:memcached-exporter parent: vexxhost-upload-docker-image provides: openstack-operator:image:memcached-exporter - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:memcached-exporter parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/memcached-jobs.yaml b/zuul.d/memcached-jobs.yaml index e737b21e..18d7ece7 100644 --- a/zuul.d/memcached-jobs.yaml +++ b/zuul.d/memcached-jobs.yaml @@ -2,27 +2,33 @@ name: openstack-operator:images:build:memcached parent: vexxhost-build-docker-image provides: openstack-operator:image:memcached - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/memcached repository: vexxhost/memcached dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/memcached/.* - job: name: openstack-operator:images:upload:memcached parent: vexxhost-upload-docker-image provides: openstack-operator:image:memcached - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:memcached parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: diff --git a/zuul.d/openstack-operator-jobs.yaml b/zuul.d/openstack-operator-jobs.yaml index cb157621..06873a3f 100644 --- a/zuul.d/openstack-operator-jobs.yaml +++ b/zuul.d/openstack-operator-jobs.yaml @@ -2,7 +2,11 @@ name: openstack-operator:images:build:openstack-operator parent: vexxhost-build-docker-image provides: openstack-operator:image:openstack-operator - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: . repository: vexxhost/openstack-operator @@ -11,11 +15,13 @@ name: openstack-operator:images:upload:openstack-operator parent: vexxhost-upload-docker-image provides: openstack-operator:image:openstack-operator - vars: *id001 + nodeset: *id001 + vars: *id002 - job: name: openstack-operator:images:promote:openstack-operator parent: vexxhost-promote-docker-image - vars: *id001 + nodeset: *id001 + vars: *id002 - project: check: jobs: diff --git a/zuul.d/rabbitmq-jobs.yaml b/zuul.d/rabbitmq-jobs.yaml index 7330147c..275c8a8a 100644 --- a/zuul.d/rabbitmq-jobs.yaml +++ b/zuul.d/rabbitmq-jobs.yaml @@ -2,27 +2,33 @@ name: openstack-operator:images:build:rabbitmq parent: vexxhost-build-docker-image provides: openstack-operator:image:rabbitmq - vars: &id001 + nodeset: &id001 + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic-vexxhost + vars: &id002 docker_images: - context: images/rabbitmq repository: vexxhost/rabbitmq dependencies: - openstack-operator:images:build:openstack-operator - files: &id002 + files: &id003 - ^images/rabbitmq/.* - job: name: openstack-operator:images:upload:rabbitmq parent: vexxhost-upload-docker-image provides: openstack-operator:image:rabbitmq - vars: *id001 + nodeset: *id001 + vars: *id002 dependencies: - openstack-operator:images:upload:openstack-operator - files: *id002 + files: *id003 - job: name: openstack-operator:images:promote:rabbitmq parent: vexxhost-promote-docker-image - vars: *id001 - files: *id002 + nodeset: *id001 + vars: *id002 + files: *id003 - project: check: jobs: