From 2c9047b5b6f2a28e59d2ccfe650043ca26fd34b5 Mon Sep 17 00:00:00 2001
From: k8s-infra-cherrypick-robot
 <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com>
Date: Tue, 29 Aug 2023 06:07:24 -0700
Subject: [PATCH] Use ci-built occm in all e2e tests (#2352)

Previously in e2e tests we only used ci-built occm for the occm e2e
test. The cinder and manila e2e tests used the latest release occm
image. With this change all e2e tests deploy a ci-built occm.

Co-authored-by: Matthew Booth <mbooth@redhat.com>
---
 tests/playbooks/roles/install-cpo-occm/defaults/main.yaml | 2 +-
 tests/playbooks/test-csi-cinder-e2e.yaml                  | 1 -
 tests/playbooks/test-csi-manila-e2e.yaml                  | 1 -
 tests/playbooks/test-occm-e2e.yaml                        | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/playbooks/roles/install-cpo-occm/defaults/main.yaml b/tests/playbooks/roles/install-cpo-occm/defaults/main.yaml
index 9f3ab3875e..c3e3952921 100644
--- a/tests/playbooks/roles/install-cpo-occm/defaults/main.yaml
+++ b/tests/playbooks/roles/install-cpo-occm/defaults/main.yaml
@@ -4,7 +4,7 @@ devstack_workdir: "{{ ansible_user_dir }}/devstack"
 
 # Used for uploading image to local registry.
 image_registry_host: localhost
-build_image: false
+build_image: true
 run_e2e: false
 # Used for access the private registry image from k8s
 remote_registry_host: "{{ ansible_default_ipv4.address }}"
diff --git a/tests/playbooks/test-csi-cinder-e2e.yaml b/tests/playbooks/test-csi-cinder-e2e.yaml
index 08d5d2a368..98481510f4 100644
--- a/tests/playbooks/test-csi-cinder-e2e.yaml
+++ b/tests/playbooks/test-csi-cinder-e2e.yaml
@@ -26,7 +26,6 @@
       cert_hosts: ' ["{{ ansible_default_ipv4.address }}"]'
     - role: install-cpo-occm
       run_e2e: false
-      build_image: false
       environment: "{{ global_env }}"
     - role: install-csi-cinder
       environment: "{{ global_env }}"
diff --git a/tests/playbooks/test-csi-manila-e2e.yaml b/tests/playbooks/test-csi-manila-e2e.yaml
index 33d4ed6444..8aca07b142 100644
--- a/tests/playbooks/test-csi-manila-e2e.yaml
+++ b/tests/playbooks/test-csi-manila-e2e.yaml
@@ -25,7 +25,6 @@
       cert_hosts: ' ["{{ ansible_default_ipv4.address }}"]'
     - role: install-cpo-occm
       run_e2e: false
-      build_image: false
     - role: install-helm
     - role: install-csi-manila
       environment: "{{ global_env }}"
diff --git a/tests/playbooks/test-occm-e2e.yaml b/tests/playbooks/test-occm-e2e.yaml
index fbb6d1ecfc..520a4479c6 100644
--- a/tests/playbooks/test-occm-e2e.yaml
+++ b/tests/playbooks/test-occm-e2e.yaml
@@ -27,5 +27,4 @@
       cert_hosts: ' ["{{ ansible_default_ipv4.address }}"]'
     - role: install-cpo-occm
       run_e2e: true
-      build_image: true
       environment: "{{ global_env }}"