diff --git a/cinder/values_overrides/pike-ubuntu_xenial.yaml b/cinder/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..6a897a938c
--- /dev/null
+++ b/cinder/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,17 @@
+---
+images:
+ tags:
+ db_init: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ cinder_db_sync: docker.io/openstackhelm/cinder:pike-ubuntu_xenial
+ db_drop: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ ks_user: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ ks_service: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ ks_endpoints: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ cinder_api: docker.io/openstackhelm/cinder:pike-ubuntu_xenial
+ bootstrap: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ cinder_scheduler: docker.io/openstackhelm/cinder:pike-ubuntu_xenial
+ cinder_volume: docker.io/openstackhelm/cinder:pike-ubuntu_xenial
+ cinder_volume_usage_audit: docker.io/openstackhelm/cinder:pike-ubuntu_xenial
+ cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
+ cinder_backup: docker.io/openstackhelm/cinder:pike-ubuntu_xenial
+ cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
diff --git a/glance/values_overrides/pike-ubuntu_xenial.yaml b/glance/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..91b64c36b6
--- /dev/null
+++ b/glance/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,13 @@
+---
+images:
+ tags:
+ bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ glance_db_sync: "docker.io/openstackhelm/glance:pike-ubuntu_xenial"
+ glance_api: "docker.io/openstackhelm/glance:pike-ubuntu_xenial"
+ glance_registry: "docker.io/openstackhelm/glance:pike-ubuntu_xenial"
+ glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
diff --git a/heat/values_overrides/pike-ubuntu_xenial.yaml b/heat/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..feb0d04fc7
--- /dev/null
+++ b/heat/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,16 @@
+---
+images:
+ tags:
+ bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ heat_db_sync: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ heat_api: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ heat_cfn: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ heat_cloudwatch: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ heat_engine: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ heat_engine_cleaner: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ heat_purge_deleted: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
diff --git a/horizon/values_overrides/pike-ubuntu_xenial.yaml b/horizon/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..4dd01557ed
--- /dev/null
+++ b/horizon/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,7 @@
+---
+images:
+ tags:
+ db_init: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ db_drop: docker.io/openstackhelm/heat:pike-ubuntu_xenial
+ horizon_db_sync: docker.io/openstackhelm/horizon:pike-ubuntu_xenial
+ horizon: docker.io/openstackhelm/horizon:pike-ubuntu_xenial
diff --git a/keystone/values_overrides/pike-ubuntu_xenial.yaml b/keystone/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..f5b9fd1ca7
--- /dev/null
+++ b/keystone/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,15 @@
+---
+images:
+ tags:
+ bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ keystone_api: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial"
+ keystone_bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ keystone_credential_rotate: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial"
+ keystone_credential_setup: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial"
+ keystone_db_sync: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial"
+ keystone_domain_manage: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial"
+ keystone_fernet_rotate: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial"
+ keystone_fernet_setup: "docker.io/openstackhelm/keystone:pike-ubuntu_xenial"
+ ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
diff --git a/neutron/values_overrides/pike-ubuntu_xenial.yaml b/neutron/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..fc5b83a48a
--- /dev/null
+++ b/neutron/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,16 @@
+---
+images:
+ tags:
+ bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ neutron_db_sync: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial"
+ neutron_dhcp: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial"
+ neutron_l3: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial"
+ neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial"
+ neutron_metadata: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial"
+ neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial"
+ neutron_server: "docker.io/openstackhelm/neutron:pike-ubuntu_xenial"
diff --git a/nova/values_overrides/pike-ubuntu_xenial.yaml b/nova/values_overrides/pike-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..e8f0b0c883
--- /dev/null
+++ b/nova/values_overrides/pike-ubuntu_xenial.yaml
@@ -0,0 +1,26 @@
+---
+images:
+ tags:
+ bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ nova_api: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_cell_setup: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_cell_setup_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
+ nova_compute: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ # nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata'
+ nova_compute_ssh: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_conductor: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_consoleauth: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_db_sync: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_novncproxy: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_novncproxy_assets: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_placement: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_scheduler: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ #nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3'
+ nova_spiceproxy: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_spiceproxy_assets: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
+ nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 388d14e3b9..73ab5dbf5b 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -66,6 +66,13 @@
- ./tools/deployment/component/common/memcached.sh
- ./tools/deployment/component/common/rabbitmq.sh
- ./tools/deployment/component/keystone/keystone.sh
+- job:
+ name: openstack-helm-keystone-pike-ubuntu_xenial
+ parent: openstack-helm-keystone
+ vars:
+ values_overrides:
+ # - ../openstack-helm-infra/ingress/values_overrides/pike-ubuntu_xenial.yaml
+ - ./keystone/values_overrides/pike-ubuntu_xenial.yaml
- job:
name: openstack-helm-keystone-rocky-opensuse_15
parent: openstack-helm-keystone
@@ -106,7 +113,14 @@
- ./tools/deployment/component/nfs-provisioner/nfs-provisioner.sh
- ./tools/deployment/component/keystone/keystone.sh
- ./tools/deployment/component/glance/glance.sh
-
+- job:
+ name: openstack-helm-glance-pike-ubuntu_xenial
+ parent: openstack-helm-glance
+ vars:
+ values_overrides:
+ # - ../openstack-helm-infra/ingress/values_overrides/pike-ubuntu_xenial.yaml
+ - ./keystone/values_overrides/pike-ubuntu_xenial.yaml
+ - ./glance/values_overrides/pike-ubuntu_xenial.yaml
- job:
name: openstack-helm-glance-rocky-opensuse_15
parent: openstack-helm-glance
@@ -132,7 +146,14 @@
- ./tools/deployment/component/common/rabbitmq.sh
- ./tools/deployment/component/keystone/keystone.sh
- ./tools/deployment/component/heat/heat.sh
-
+- job:
+ name: openstack-helm-heat-pike-ubuntu_xenial
+ parent: openstack-helm-heat
+ vars:
+ values_overrides:
+ # - ../openstack-helm-infra/ingress/values_overrides/pike-ubuntu_xenial.yaml
+ - ./keystone/values_overrides/pike-ubuntu_xenial.yaml
+ - ./heat/values_overrides/pike-ubuntu_xenial.yaml
- job:
name: openstack-helm-heat-rocky-opensuse_15
parent: openstack-helm-heat
@@ -160,7 +181,14 @@
- ./tools/deployment/component/common/rabbitmq.sh
- ./tools/deployment/component/keystone/keystone.sh
- ./tools/deployment/component/cinder/cinder.sh
-
+- job:
+ name: openstack-helm-cinder-pike-ubuntu_xenial
+ parent: openstack-helm-cinder
+ vars:
+ values_overrides:
+ # - ../openstack-helm-infra/ingress/values_overrides/pike-ubuntu_xenial.yaml
+ - ./keystone/values_overrides/pike-ubuntu_xenial.yaml
+ - ./cinder/values_overrides/pike-ubuntu_xenial.yaml
- job:
name: openstack-helm-cinder-rocky-opensuse_15
parent: openstack-helm-cinder
@@ -193,7 +221,19 @@
- ./tools/deployment/component/compute-kit/compute-kit.sh
- ./tools/deployment/developer/common/170-setup-gateway.sh
- ./tools/deployment/developer/common/900-use-it.sh
-
+- job:
+ name: openstack-helm-compute-kit-pike-ubuntu_xenial
+ parent: openstack-helm-compute-kit
+ vars:
+ values_overrides:
+ # - ../openstack-helm-infra/ingress/values_overrides/pike-ubuntu_xenial.yaml
+ - ./keystone/values_overrides/pike-ubuntu_xenial.yaml
+ - ./heat/values_overrides/pike-ubuntu_xenial.yaml
+ - ./glance/values_overrides/pike-ubuntu_xenial.yaml
+ # - ../openstack-helm-infra/openvswitch/values_overrides/pike-ubuntu_xenial.yaml
+ # - ../openstack-helm-infra/libvirt/values_overrides/pike-ubuntu_xenial.yaml
+ - ./neutron/values_overrides/pike-ubuntu_xenial.yaml
+ - ./nova/values_overrides/pike-ubuntu_xenial.yaml
- job:
name: openstack-helm-compute-kit-rocky-opensuse_15
parent: openstack-helm-compute-kit
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1e2d82e3fc..2b66b37349 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -26,19 +26,29 @@
- openstack-helm-lint
- openstack-helm-bandit
- openstack-helm-keystone
+ - openstack-helm-keystone-pike-ubuntu_xenial:
+ voting: false
- openstack-helm-keystone-rocky-opensuse_15:
voting: false
- openstack-helm-keystone-ldap
- openstack-helm-glance
+ - openstack-helm-glance-pike-ubuntu_xenial:
+ voting: false
- openstack-helm-glance-rocky-opensuse_15:
voting: false
- openstack-helm-heat
+ - openstack-helm-heat-pike-ubuntu_xenial:
+ voting: false
- openstack-helm-heat-rocky-opensuse_15:
voting: false
- openstack-helm-cinder
+ - openstack-helm-cinder-pike-ubuntu_xenial:
+ voting: false
- openstack-helm-cinder-rocky-opensuse_15:
voting: false
- openstack-helm-compute-kit
+ - openstack-helm-compute-kit-pike-ubuntu_xenial:
+ voting: false
- openstack-helm-compute-kit-rocky-opensuse_15:
voting: false
- openstack-helm-horizon