From 431b6ed7c8ee56e330295174d34f36f45cbaa6f7 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Fri, 30 Nov 2018 12:09:30 +0100
Subject: [PATCH] OSBS: v1 builds are getting deprecated

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 inventory/group_vars/osbs-masters                             | 2 +-
 inventory/group_vars/osbs-masters-stg                         | 4 ++--
 roles/osbs-client/templates/osbs.conf.j2                      | 3 +--
 .../tests/files/expected-client-config-secret.conf            | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/inventory/group_vars/osbs-masters b/inventory/group_vars/osbs-masters
index ad44511010..aa6dd7eb9c 100644
--- a/inventory/group_vars/osbs-masters
+++ b/inventory/group_vars/osbs-masters
@@ -58,7 +58,7 @@ osbs_conf_worker_clusters:
 osbs_platform_descriptors:
 - platform: x86_64
   architecture: amd64
-  enable_v1: True
+  enable_v1: False
 
 _osbs_reactor_config_map:
     version: 1
diff --git a/inventory/group_vars/osbs-masters-stg b/inventory/group_vars/osbs-masters-stg
index a413af9961..7a9c01fd3f 100644
--- a/inventory/group_vars/osbs-masters-stg
+++ b/inventory/group_vars/osbs-masters-stg
@@ -59,11 +59,11 @@ osbs_conf_worker_clusters:
 osbs_platform_descriptors:
 - platform: x86_64
   architecture: amd64
-  enable_v1: True
+  enable_v1: Flase
 
 - platform: aarch64
   architecture: arm64
-  enable_v1: True
+  enable_v1: Flase
 
 _osbs_reactor_config_map:
     version: 1
diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2
index 20a7ebaba0..a444e89f12 100644
--- a/roles/osbs-client/templates/osbs.conf.j2
+++ b/roles/osbs-client/templates/osbs.conf.j2
@@ -6,7 +6,6 @@ openshift_required_version = {{ general.openshift_required_version }}
 {% if env == 'staging' %}
 [platform:x86_64]
 architecture = amd64
-enable_v1 = true
 
 [platform:aarch64]
 architecture: arm64
@@ -198,4 +197,4 @@ reactor_config_map = {{ default.reactor_config_map_scratch }}
 
 {% if default.build_from is defined %}
 build_from = {{ default.build_from }}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/roles/osbs-namespace/tests/files/expected-client-config-secret.conf b/roles/osbs-namespace/tests/files/expected-client-config-secret.conf
index 4ae5d537f1..77749b26a1 100644
--- a/roles/osbs-namespace/tests/files/expected-client-config-secret.conf
+++ b/roles/osbs-namespace/tests/files/expected-client-config-secret.conf
@@ -49,7 +49,6 @@ vendor = Fedora Project
 
 [platform:x86_64]
 architecture = amd64
-enable_v1 = true
 
 [platform:aarch64]
 architecture = arm64