From 7f42914f7d92bffc6b8b96a7b65813bfbd962196 Mon Sep 17 00:00:00 2001
From: "Gupta, Sangeet (sg774j)" <sg774j@att.com>
Date: Thu, 22 Apr 2021 14:19:33 +0000
Subject: [PATCH] Zuul.d: Making TLS gate voting again

Reverting https://review.opendev.org/c/openstack/openstack-helm/+/773651
since ubuntu-bionic-expanded seems to be available now.

Depends-on: https://review.opendev.org/c/openstack/openstack-helm/+/787557

Change-Id: Ib93eca9e6e84a60af2bd3ed5b90647966fa0aca3
---
 zuul.d/jobs-openstack-helm.yaml | 4 ++--
 zuul.d/project.yaml             | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 6a764b7d20..c7ed0595c9 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -305,10 +305,10 @@
 - job:
     name: openstack-helm-tls
     parent: openstack-helm-chart-deploy
-    nodeset: openstack-helm-single-16GB-node
+    nodeset: openstack-helm-single-32GB-node
     vars:
       osh_params:
-        openstack_release: stein
+        openstack_release: train
         container_distro_name: ubuntu
         container_distro_version: bionic
         feature_gates: tls
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e3124122d1..6de16c139c 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -34,13 +34,7 @@
     gate:
       jobs:
         - openstack-helm-lint
-        - openstack-helm-tls:
-            # NOTE(aostapenko) While keeping this job non-voting in gate
-            # pipeline may not seem to have sense - disabling it is temporary
-            # and job result should be kept visible so it's not forgotten
-            # to be enabled first thing after ubuntu-bionic-expanded nodes
-            # are available
-            voting: false
+        - openstack-helm-tls
         - openstack-helm-cinder-train-ubuntu_bionic
         - openstack-helm-compute-kit-train-ubuntu_bionic
         - openstack-helm-horizon-train-ubuntu_bionic