Browse Source

Use vexxhost-specific labels

Change-Id: I9a3e1669195997fd347b8662c754f30feb97179d
changes/12/744212/3
Mohammed Naser 11 months ago
parent
commit
d10f7e5e8f
15 changed files with 180 additions and 93 deletions
  1. +11
    -0
      hack/update-zuul-jobs.py
  2. +2
    -2
      images/glance/requirements.txt
  3. +12
    -6
      zuul.d/ceilometer-jobs.yaml
  4. +26
    -22
      zuul.d/functional-jobs.yaml
  5. +12
    -6
      zuul.d/glance-jobs.yaml
  6. +12
    -6
      zuul.d/heat-jobs.yaml
  7. +12
    -6
      zuul.d/horizon-jobs.yaml
  8. +12
    -6
      zuul.d/keystone-jobs.yaml
  9. +12
    -6
      zuul.d/magnum-jobs.yaml
  10. +12
    -6
      zuul.d/mcrouter-exporter-jobs.yaml
  11. +12
    -6
      zuul.d/mcrouter-jobs.yaml
  12. +12
    -6
      zuul.d/memcached-exporter-jobs.yaml
  13. +12
    -6
      zuul.d/memcached-jobs.yaml
  14. +9
    -3
      zuul.d/openstack-operator-jobs.yaml
  15. +12
    -6
      zuul.d/rabbitmq-jobs.yaml

+ 11
- 0
hack/update-zuul-jobs.py View File

@ -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,
}
}


+ 2
- 2
images/glance/requirements.txt View File

@ -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
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

+ 12
- 6
zuul.d/ceilometer-jobs.yaml View File

@ -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:


+ 26
- 22
zuul.d/functional-jobs.yaml View File

@ -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
- name: openstack-operator:images:build:heat
soft: true
- name: openstack-operator:images:build:glance
- name: openstack-operator:images:build:ceilometer
soft: true
- name: openstack-operator:images:build:rabbitmq
soft: true
- name: openstack-operator:images:build:ceilometer
- name: openstack-operator:images:build:keystone
soft: true
- name: openstack-operator:images:build:memcached-exporter
- name: openstack-operator:images:build:horizon
soft: true
- name: openstack-operator:images:build:memcached
soft: true
- name: openstack-operator:images:build:keystone
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
- name: openstack-operator:images:upload:heat
soft: true
- name: openstack-operator:images:upload:glance
- name: openstack-operator:images:upload:ceilometer
soft: true
- name: openstack-operator:images:upload:rabbitmq
soft: true
- name: openstack-operator:images:upload:ceilometer
- name: openstack-operator:images:upload:keystone
soft: true
- name: openstack-operator:images:upload:memcached-exporter
- name: openstack-operator:images:upload:horizon
soft: true
- name: openstack-operator:images:upload:memcached
soft: true
- name: openstack-operator:images:upload:keystone
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

+ 12
- 6
zuul.d/glance-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/heat-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/horizon-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/keystone-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/magnum-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/mcrouter-exporter-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/mcrouter-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/memcached-exporter-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/memcached-jobs.yaml View File

@ -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:


+ 9
- 3
zuul.d/openstack-operator-jobs.yaml View File

@ -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:


+ 12
- 6
zuul.d/rabbitmq-jobs.yaml View File

@ -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:


Loading…
Cancel
Save