From f845fa750b74f8abf8bdca229ff2fa9f1f6987ae Mon Sep 17 00:00:00 2001
From: YiqinZhang <yiqzhang@redhat.com>
Date: Fri, 23 Jan 2026 14:27:10 -0500
Subject: [PATCH 1/2] remove sidecar container

---
 test/e2e/e2e-template.yml | 77 +++++----------------------------------
 1 file changed, 10 insertions(+), 67 deletions(-)

diff --git a/test/e2e/e2e-template.yml b/test/e2e/e2e-template.yml
index 8b9cc15..3837c2b 100644
--- a/test/e2e/e2e-template.yml
+++ b/test/e2e/e2e-template.yml
@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
-# Temporarily add S3 upload capability to the osde2e template for testing
+# Native osde2e S3 upload is enabled - no sidecar needed
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
@@ -30,7 +30,7 @@ parameters:
     value: ''
     required: true
   - name: LOG_BUCKET
-    value: 'osde2e-logs'
+    value: 'osde2e-loki-logs'
   - name: USE_EXISTING_CLUSTER
     value: 'TRUE'
   - name: CAD_PAGERDUTY_ROUTING_KEY
@@ -43,14 +43,6 @@ parameters:
     required: false
   - name: SLACK_NOTIFY
     required: false
-  - name: S3_RESULTS_BUCKET
-    value: 'osde2e-loki-logs'
-  - name: S3_RESULTS_REGION
-    value: 'us-east-1'
-  - name: ENABLE_S3_UPLOAD
-    value: 'true'
-  - name: OPERATOR_NAME
-    value: 'osd-example-operator'
 objects:
   - apiVersion: batch/v1
     kind: Job
@@ -61,21 +53,18 @@ objects:
       template:
         spec:
           restartPolicy: Never
-          volumes:
-            - name: test-results
-              emptyDir: {}
           containers:
             - name: osde2e
               image: quay.io/redhat-services-prod/osde2e-cicada-tenant/osde2e:latest
               command:
-                - /bin/sh
-                - -c
-                - |
-                  /osde2e test --only-health-check-nodes --skip-destroy-cluster --skip-must-gather --log-analysis-enable --configs ${OSDE2E_CONFIGS}
-                  TEST_EXIT_CODE=$?
-                  cp -r /test-run-results/* /shared-results/ 2>/dev/null || true
-                  echo "$TEST_EXIT_CODE" > /shared-results/.test-complete
-                  exit $TEST_EXIT_CODE
+                - /osde2e
+                - test
+                - --only-health-check-nodes
+                - --skip-destroy-cluster
+                - --skip-must-gather
+                - --log-analysis-enable
+                - --configs
+                - ${OSDE2E_CONFIGS}
               securityContext:
                 runAsNonRoot: true
                 allowPrivilegeEscalation: false
@@ -135,49 +124,3 @@ objects:
                       key: cad-pagerduty-routing-key
                 - name: SLACK_NOTIFY
                   value: ${SLACK_NOTIFY}
-              volumeMounts:
-                - name: test-results
-                  mountPath: /shared-results
-            - name: s3-uploader
-              image: quay.io/app-sre/aws-cli
-              command:
-                - /bin/sh
-                - -c
-                - |
-                  while [ ! -f /shared-results/.test-complete ]; do sleep 10; done
-                  if [ "${ENABLE_S3_UPLOAD}" != "true" ]; then exit 0; fi
-                  DATE=$(date -u +%Y-%m-%d)
-                  S3_PREFIX="test-results/${OPERATOR_NAME}/${DATE}/${IMAGE_TAG}-${JOBID}"
-                  aws s3 sync /shared-results/ "s3://${S3_RESULTS_BUCKET}/${S3_PREFIX}/" --exclude ".test-complete" --no-progress
-                  echo "Uploaded to s3://${S3_RESULTS_BUCKET}/${S3_PREFIX}/"
-              securityContext:
-                runAsNonRoot: true
-                allowPrivilegeEscalation: false
-                capabilities:
-                  drop: ["ALL"]
-                seccompProfile:
-                  type: RuntimeDefault
-              env:
-                - name: AWS_ACCESS_KEY_ID
-                  valueFrom:
-                    secretKeyRef:
-                      name: osde2e-aws-credentials
-                      key: aws-access-key-id
-                - name: AWS_SECRET_ACCESS_KEY
-                  valueFrom:
-                    secretKeyRef:
-                      name: osde2e-aws-credentials
-                      key: aws-secret-access-key
-                - name: AWS_DEFAULT_REGION
-                  value: ${S3_RESULTS_REGION}
-                - name: S3_RESULTS_BUCKET
-                  value: ${S3_RESULTS_BUCKET}
-                - name: OPERATOR_NAME
-                  value: ${OPERATOR_NAME}
-                - name: IMAGE_TAG
-                  value: ${IMAGE_TAG}
-                - name: ENABLE_S3_UPLOAD
-                  value: ${ENABLE_S3_UPLOAD}
-              volumeMounts:
-                - name: test-results
-                  mountPath: /shared-results

From b0afb548e819f215ed46d4b72908bec1c4c9ed9c Mon Sep 17 00:00:00 2001
From: YiqinZhang <yiqzhang@redhat.com>
Date: Wed, 28 Jan 2026 20:43:10 -0500
Subject: [PATCH 2/2] [SDCICD-1729] Revert e2e-template.yml to pre-PR#518 state

Reverts the s3 upload comment change from PR #518, restoring
the template to commit 3f9655c state.
---
 test/e2e/e2e-template.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/e2e/e2e-template.yml b/test/e2e/e2e-template.yml
index 3837c2b..6d3c4ce 100644
--- a/test/e2e/e2e-template.yml
+++ b/test/e2e/e2e-template.yml
@@ -1,5 +1,4 @@
 # THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
-# Native osde2e S3 upload is enabled - no sidecar needed
 apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
@@ -30,7 +29,7 @@ parameters:
     value: ''
     required: true
   - name: LOG_BUCKET
-    value: 'osde2e-loki-logs'
+    value: 'osde2e-logs'
   - name: USE_EXISTING_CLUSTER
     value: 'TRUE'
   - name: CAD_PAGERDUTY_ROUTING_KEY
@@ -58,6 +57,7 @@ objects:
               image: quay.io/redhat-services-prod/osde2e-cicada-tenant/osde2e:latest
               command:
                 - /osde2e
+              args:
                 - test
                 - --only-health-check-nodes
                 - --skip-destroy-cluster