From 01de4eacfc1f17003f9ade2e602df45a969266c8 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Tue, 22 Sep 2020 12:21:13 +0200
Subject: [PATCH] ci: restructure 'parameters' section for upgrade-tests

The section containing the paramaters does not seem to be structured
correctly, correct it.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 deploy/jjb.sh           |  1 +
 jobs/upgrade-tests.yaml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/deploy/jjb.sh b/deploy/jjb.sh
index b4aaf9531..bb9a55108 100755
--- a/deploy/jjb.sh
+++ b/deploy/jjb.sh
@@ -40,6 +40,7 @@ cd "$(dirname "${0}")"
 # unique ID for the session
 SESSION=$(uuidgen)
 
+oc process -f "jjb-${CMD}.yaml" -p=SESSION="${SESSION}" -p=GIT_REF="${GIT_REF}"
 oc process -f "jjb-${CMD}.yaml" -p=SESSION="${SESSION}" -p=GIT_REF="${GIT_REF}" | oc create -f -
 
 # loop until pod is available
diff --git a/jobs/upgrade-tests.yaml b/jobs/upgrade-tests.yaml
index ee6b111a5..a55e6bf53 100644
--- a/jobs/upgrade-tests.yaml
+++ b/jobs/upgrade-tests.yaml
@@ -23,14 +23,14 @@
     test_type: '<unset>'
     # generated parameters for the job (used in the groovy script)
     parameters:
-      - name: k8s_version
-        type: string
-        default: '{k8s_version}'
-        description: Kubernetes version to deploy in the test cluster.
-      - name: test_type
-        type: string
-        default: '{test_type}'
-        description: Mentions whether upgrade tests run for rbd/cephfs.
+      - string:
+          name: k8s_version
+          default: '{k8s_version}'
+          description: Kubernetes version to deploy in the test cluster.
+      - string:
+          name: test_type
+          default: '{test_type}'
+          description: Mentions whether upgrade tests run for rbd/cephfs.
     pipeline-scm:
       scm:
         - git: