From 7bddd152cddaf48a0ebc1c8c92a339ffe46fc8e0 Mon Sep 17 00:00:00 2001
From: Pavol Loffay <p.loffay@gmail.com>
Date: Wed, 17 Jun 2026 11:12:53 +0200
Subject: [PATCH] Fix upgrade teste by splitting TA and collector versions

Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
---
 tests/e2e-openshift-upgrade/upgrade/README.md           | 9 ++++++---
 tests/e2e-openshift-upgrade/upgrade/assert-upgrade.yaml | 4 ++--
 tests/e2e-openshift-upgrade/upgrade/chainsaw-test.yaml  | 9 ++++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tests/e2e-openshift-upgrade/upgrade/README.md b/tests/e2e-openshift-upgrade/upgrade/README.md
index 2346422f4a..ce9dd92996 100644
--- a/tests/e2e-openshift-upgrade/upgrade/README.md
+++ b/tests/e2e-openshift-upgrade/upgrade/README.md
@@ -29,7 +29,8 @@ The test is designed to be run as part of the chainsaw test suite and requires s
 
 The test requires the following values to be provided:
 - `upgrade_fbc_image`: File-based catalog (FBC) image for upgrading the operator
-- `upgrade_otel_version`: Target OpenTelemetry Operator version 
+- `upgrade_collector_version`: Expected OpenTelemetry Collector version after upgrade (from `opentelemetry-collector` in `versions.txt`)
+- `upgrade_ta_version`: Expected Target Allocator version after upgrade (from `targetallocator` in `versions.txt`)
 - `upgrade_operator_csv_name`: CSV name for the operator upgrade
 
 ### Running the Test
@@ -40,7 +41,8 @@ Use one of the following methods to run the upgrade test:
 ```bash
 chainsaw test tests/e2e-openshift-upgrade --values - <<EOF
 upgrade_fbc_image: brew.registry.redhat.io/rh-osbs/iib:986879
-upgrade_otel_version: 0.127.0
+upgrade_collector_version: 0.127.0
+upgrade_ta_version: 0.127.0
 upgrade_operator_csv_name: opentelemetry-operator.v0.127.0-1
 EOF
 ```
@@ -49,7 +51,8 @@ EOF
 Create a `values.yaml` file:
 ```yaml
 upgrade_fbc_image: brew.registry.redhat.io/rh-osbs/iib:986879
-upgrade_otel_version: 0.127.0
+upgrade_collector_version: 0.127.0
+upgrade_ta_version: 0.127.0
 upgrade_operator_csv_name: opentelemetry-operator.v0.127.0-1
 ```
 
diff --git a/tests/e2e-openshift-upgrade/upgrade/assert-upgrade.yaml b/tests/e2e-openshift-upgrade/upgrade/assert-upgrade.yaml
index d4bd5dc05d..d58bb303bb 100644
--- a/tests/e2e-openshift-upgrade/upgrade/assert-upgrade.yaml
+++ b/tests/e2e-openshift-upgrade/upgrade/assert-upgrade.yaml
@@ -38,7 +38,7 @@ metadata:
 status:
   scale:
     replicas: 1
-  version: ($upgrade_otel_version)
+  version: ($upgrade_collector_version)
 
 ---
 apiVersion: opentelemetry.io/v1alpha1
@@ -47,4 +47,4 @@ metadata:
   name: simplest
   namespace: chainsaw-upgrade
 status:
-  version: ($upgrade_otel_version)
+  version: ($upgrade_ta_version)
diff --git a/tests/e2e-openshift-upgrade/upgrade/chainsaw-test.yaml b/tests/e2e-openshift-upgrade/upgrade/chainsaw-test.yaml
index 38457e59f8..38e1404d96 100644
--- a/tests/e2e-openshift-upgrade/upgrade/chainsaw-test.yaml
+++ b/tests/e2e-openshift-upgrade/upgrade/chainsaw-test.yaml
@@ -7,8 +7,10 @@ spec:
   bindings:
   - name: upgrade_fbc_image
     value: ($values.upgrade_fbc_image)
-  - name: upgrade_otel_version
-    value: ($values.upgrade_otel_version)
+  - name: upgrade_collector_version
+    value: ($values.upgrade_collector_version)
+  - name: upgrade_ta_version
+    value: ($values.upgrade_ta_version)
   - name: upgrade_operator_csv_name
     value: ($values.upgrade_operator_csv_name)
   # Refer Chainsaw docs on how to pass data to tests.
@@ -16,7 +18,8 @@ spec:
   # Example using heredoc:
   # chainsaw test tests/e2e-openshift-upgrade --values - <<EOF
   # upgrade_fbc_image: brew.registry.redhat.io/rh-osbs/iib:986879
-  # upgrade_otel_version: 0.127.0
+  # upgrade_collector_version: 0.127.0
+  # upgrade_ta_version: 0.127.0
   # upgrade_operator_csv_name: opentelemetry-operator.v0.127.0-1
   # EOF
   steps: