diff --git a/.zuul.yaml b/.zuul.yaml index 033f752a00..a78e7a2c23 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -16,7 +16,12 @@ check: jobs: - openstack-helm-linter - - openstack-helm-dev-deploy-ceph-ovs: + - openstack-helm-dev-deploy-ceph-radosgw-ovs: + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^releasenotes/.*$ + - openstack-helm-dev-deploy-ceph-rbd-ovs: irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -100,7 +105,12 @@ - ^.*\.rst$ - ^doc/.*$ - ^releasenotes/.*$ - - openstack-helm-dev-deploy-ceph-ovs: + - openstack-helm-dev-deploy-ceph-radosgw-ovs: + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^releasenotes/.*$ + - openstack-helm-dev-deploy-ceph-rbd-ovs: irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -135,7 +145,16 @@ nodeset: openstack-helm-single-node - job: - name: openstack-helm-dev-deploy-ceph-ovs + name: openstack-helm-dev-deploy-ceph-radosgw-ovs + vars: + zuul_glance_backend: radosgw + parent: openstack-helm-dev-deploy + run: tools/gate/playbooks/dev-deploy-ceph.yaml + +- job: + name: openstack-helm-dev-deploy-ceph-rbd-ovs + vars: + zuul_glance_backend: rbd parent: openstack-helm-dev-deploy run: tools/gate/playbooks/dev-deploy-ceph.yaml diff --git a/tools/deployment/developer/ceph/120-glance.sh b/tools/deployment/developer/ceph/120-glance.sh index 6ca7822ae3..9234d835d7 100755 --- a/tools/deployment/developer/ceph/120-glance.sh +++ b/tools/deployment/developer/ceph/120-glance.sh @@ -21,7 +21,8 @@ make pull-images glance #NOTE: Deploy command : ${OSH_EXTRA_HELM_ARGS:=""} -GLANCE_BACKEND="radosgw" # NOTE(portdirect), this could be: radosgw, rbd, swift or pvc +#NOTE(portdirect), this could be: radosgw, rbd, swift or pvc +: ${GLANCE_BACKEND:="radosgw"} helm upgrade --install glance ./glance \ --namespace=openstack \ --set storage=${GLANCE_BACKEND} \ diff --git a/tools/gate/playbooks/dev-deploy-ceph.yaml b/tools/gate/playbooks/dev-deploy-ceph.yaml index b2d87bacb2..411f724939 100644 --- a/tools/gate/playbooks/dev-deploy-ceph.yaml +++ b/tools/gate/playbooks/dev-deploy-ceph.yaml @@ -135,6 +135,7 @@ environment: OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" + GLANCE_BACKEND: "{{ zuul_glance_backend | default('') }}" args: chdir: "{{ zuul.project.src_dir }}" - name: Deploy Cinder