Merge "Extend OpenSUSE Leap15 testing"

2019-05-16 13:31:26 +00:00 · 2019-05-16 13:31:26 +00:00 · aca516f3a2
parent 4550ea9376 5bb58ebf02
commit aca516f3a2
9 changed files with 66 additions and 0 deletions
--- a/tools/deployment/component/cinder/cinder.sh
+++ b/tools/deployment/component/cinder/cinder.sh
@ -37,6 +37,7 @@ helm upgrade --install cinder ./cinder \
  --namespace=openstack \
  --values=/tmp/cinder.yaml \
  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
  ${OSH_EXTRA_HELM_ARGS_CINDER}

 #NOTE: Wait for deploy
--- a/tools/deployment/component/common/ingress.sh
+++ b/tools/deployment/component/common/ingress.sh
@ -33,6 +33,7 @@ helm upgrade --install ingress-kube-system ${OSH_INFRA_PATH}/ingress \
  --namespace=kube-system \
  --values=/tmp/ingress-kube-system.yaml \
  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
  ${OSH_EXTRA_HELM_ARGS_INGRESS_KUBE_SYSTEM}

 #NOTE: Wait for deploy
@ -45,6 +46,7 @@ helm status ingress-kube-system
 helm upgrade --install ingress-openstack ${OSH_INFRA_PATH}/ingress \
  --namespace=openstack \
  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
  ${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}

 #NOTE: Wait for deploy
--- a/tools/deployment/component/compute-kit/compute-kit.sh
+++ b/tools/deployment/component/compute-kit/compute-kit.sh
@ -27,6 +27,7 @@ if [ "x$(systemd-detect-virt)" == "xnone" ]; then
      --namespace=openstack \
      --set conf.ceph.enabled=false \
      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
      ${OSH_EXTRA_HELM_ARGS_NOVA}
 else
  echo 'OSH is being deployed in virtualized environment, using qemu for nova'
@ -36,6 +37,7 @@ else
      --set conf.nova.libvirt.virt_type=qemu \
      --set conf.nova.libvirt.cpu_mode=none \
      ${OSH_EXTRA_HELM_ARGS} \
+      ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
      ${OSH_EXTRA_HELM_ARGS_NOVA}
 fi

@ -68,6 +70,7 @@ helm upgrade --install neutron ./neutron \
    --namespace=openstack \
    --values=/tmp/neutron.yaml \
    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
    ${OSH_EXTRA_HELM_ARGS_NEUTRON}

 #NOTE: Wait for deploy
--- a/tools/deployment/component/compute-kit/libvirt.sh
+++ b/tools/deployment/component/compute-kit/libvirt.sh
@ -25,6 +25,7 @@ helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \
  --namespace=openstack \
  --set conf.ceph.enabled=false \
  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
  ${OSH_EXTRA_HELM_ARGS_LIBVIRT}

 #NOTE(portdirect): We don't wait for libvirt pods to come up, as they depend
--- a/tools/deployment/component/compute-kit/openvswitch.sh
+++ b/tools/deployment/component/compute-kit/openvswitch.sh
@ -24,6 +24,7 @@ make -C ${OSH_INFRA_PATH} openvswitch
 helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \
  --namespace=openstack \
  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
  ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}

 #NOTE: Wait for deploy
--- a/tools/deployment/component/glance/glance.sh
+++ b/tools/deployment/component/glance/glance.sh
@ -46,6 +46,7 @@ helm upgrade --install glance ./glance \
  --namespace=openstack \
  --values=/tmp/glance.yaml \
  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
  ${OSH_EXTRA_HELM_ARGS_GLANCE}

 #NOTE: Wait for deploy
--- a/tools/deployment/component/heat/heat.sh
+++ b/tools/deployment/component/heat/heat.sh
@ -23,6 +23,7 @@ make heat
 helm upgrade --install heat ./heat \
  --namespace=openstack \
  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
  ${OSH_EXTRA_HELM_ARGS_HEAT}

 #NOTE: Wait for deploy
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@ -71,6 +71,7 @@
    parent: openstack-helm-keystone
    vars:
      values_overrides:
+        - ../openstack-helm-infra/ingress/values_overrides/rocky-opensuse_15.yaml
        - ./keystone/values_overrides/opensuse_15.yaml
        - ./keystone/values_overrides/rocky-opensuse_15.yaml

@ -106,6 +107,16 @@
        - ./tools/deployment/component/keystone/keystone.sh
        - ./tools/deployment/component/glance/glance.sh

+- job:
+    name: openstack-helm-glance-rocky-opensuse_15
+    parent: openstack-helm-glance
+    vars:
+      values_overrides:
+        - ../openstack-helm-infra/ingress/values_overrides/rocky-opensuse_15.yaml
+        - ./keystone/values_overrides/opensuse_15.yaml
+        - ./keystone/values_overrides/rocky-opensuse_15.yaml
+        - ./glance/values_overrides/rocky-opensuse_15.yaml
+
 - job:
    name: openstack-helm-heat
    parent: openstack-helm-chart-deploy
@ -122,6 +133,16 @@
        - ./tools/deployment/component/keystone/keystone.sh
        - ./tools/deployment/component/heat/heat.sh

+- job:
+    name: openstack-helm-heat-rocky-opensuse_15
+    parent: openstack-helm-heat
+    vars:
+      values_overrides:
+        - ../openstack-helm-infra/ingress/values_overrides/rocky-opensuse_15.yaml
+        - ./keystone/values_overrides/opensuse_15.yaml
+        - ./keystone/values_overrides/rocky-opensuse_15.yaml
+        - ./heat/values_overrides/rocky-opensuse_15.yaml
+
 - job:
    name: openstack-helm-cinder
    parent: openstack-helm-chart-deploy
@ -140,6 +161,16 @@
        - ./tools/deployment/component/keystone/keystone.sh
        - ./tools/deployment/component/cinder/cinder.sh

+- job:
+    name: openstack-helm-cinder-rocky-opensuse_15
+    parent: openstack-helm-cinder
+    vars:
+      values_overrides:
+        - ../openstack-helm-infra/ingress/values_overrides/rocky-opensuse_15.yaml
+        - ./keystone/values_overrides/opensuse_15.yaml
+        - ./keystone/values_overrides/rocky-opensuse_15.yaml
+        - ./cinder/values_overrides/rocky-opensuse_15.yaml
+
 - job:
    name: openstack-helm-compute-kit
    parent: openstack-helm-chart-deploy
@ -163,6 +194,23 @@
        - ./tools/deployment/developer/common/170-setup-gateway.sh
        - ./tools/deployment/developer/common/900-use-it.sh

+- job:
+    name: openstack-helm-compute-kit-rocky-opensuse_15
+    parent: openstack-helm-compute-kit
+    vars:
+      values_overrides:
+        - ../openstack-helm-infra/ingress/values_overrides/rocky-opensuse_15.yaml
+        - ./keystone/values_overrides/opensuse_15.yaml
+        - ./keystone/values_overrides/rocky-opensuse_15.yaml
+        - ./heat/values_overrides/rocky-opensuse_15.yaml
+        - ./glance/values_overrides/rocky-opensuse_15.yaml
+        - ../openstack-helm-infra/openvswitch/values_overrides/rocky-opensuse_15.yaml
+        - ../openstack-helm-infra/libvirt/values_overrides/rocky-opensuse_15.yaml
+        - ./neutron/values_overrides/rocky.yaml
+        - ./neutron/values_overrides/rocky-opensuse_15.yaml
+        - ./nova/values_overrides/opensuse_15.yaml
+        - ./nova/values_overrides/rocky-opensuse_15.yaml
+
 - job:
    name: openstack-helm-apparmor
    parent: openstack-helm-chart-deploy
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@ -30,9 +30,17 @@
            voting: false
        - openstack-helm-keystone-ldap
        - openstack-helm-glance
+        - openstack-helm-glance-rocky-opensuse_15:
+            voting: false
        - openstack-helm-heat
+        - openstack-helm-heat-rocky-opensuse_15:
+            voting: false
        - openstack-helm-cinder
+        - openstack-helm-cinder-rocky-opensuse_15:
+            voting: false
        - openstack-helm-compute-kit
+        - openstack-helm-compute-kit-rocky-opensuse_15:
+            voting: false
        - openstack-helm-apparmor:
            voting: false
    gate: