Merge branch 'main' into add_qase

Author: omkarkhatavkar

.github/workflows/docker_run.yaml

@@ -15,8 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag: ['v2.10-head', 'v2.11-head', 'v2.12-head', 'head'] # Rancher version tags
+        tag: ['v2.11-head', 'v2.12-head', 'head'] # Rancher version tags
       fail-fast: false
+      # This expression sets max-parallel to 1 for schedules, and 4 for all other events
+      max-parallel: ${{ github.event_name == 'schedule' && 1 || 4 }}
 
     steps:
       - name: Generate random password
@@ -107,6 +109,7 @@ jobs:
       - name: Run Observability Charts Tests
         id: run_observability_tests
         run: |
+          sleep 60
           set -e
           TEST_LABEL_FILTER=installation go test -timeout 20m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-installation-${{ matrix.tag }}.txt
           TEST_LABEL_FILTER=E2E go test -timeout 30m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-e2e-${{ matrix.tag }}.txt
@@ -121,6 +124,7 @@ jobs:
       - name: Run Observability Upgrade tests
         id: run_observability_upgrade_tests
         run: |
+          sleep 60
           set -e
           TEST_LABEL_FILTER=beforeUpgrade go test -timeout 20m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-upgrade-${{ matrix.tag }}.txt
           TEST_LABEL_FILTER=E2E go test -timeout 30m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-e2e-${{ matrix.tag }}.txt

.github/workflows/k3s_run.yaml

@@ -23,6 +23,8 @@ jobs:
           - k3s_version: v1.32.8+k3s1
             rancher_version: latest/devel/head
       fail-fast: false
+      # This expression sets max-parallel to 1 for schedules, and 4 for all other events
+      max-parallel: ${{ github.event_name == 'schedule' && 1 || 4 }}
 
     steps:
       - name: Set environment variables
@@ -53,6 +55,7 @@ jobs:
       - name: Install K3S Version ${{ matrix.k3s_version }} & Rancher Version ${{ matrix.rancher_version }}
         id: install_k3s_and_rancher
         run: |
+          sleep 120
           set -e
           go test -timeout 30m -run ^TestE2E$ github.com/rancher/observability-e2e/installations/k3s -v -count=1 -ginkgo.v
 
@@ -73,13 +76,15 @@ jobs:
       - name: Run Installation Charts Tests For Backup and Restore
         id: run_installation_tests_backup_restore
         run: |
+          sleep 60
           set -e
           mv ./tests/helper/yamls/inputBackupRestoreConfig.yaml.example ./tests/helper/yamls/inputBackupRestoreConfig.yaml
           TEST_LABEL_FILTER=installation go test -timeout 20m github.com/rancher/observability-e2e/tests/backuprestore/functional -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-installation-${{ matrix.k3s_version }}.txt
 
       - name: Run Observability Upgrade tests
         id: run_observability_upgrade_tests
         run: |
+          sleep 60
           set -e
           TEST_LABEL_FILTER=beforeUpgrade go test -timeout 20m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-upgrade-${{ matrix.k3s_version }}.txt
           TEST_LABEL_FILTER=E2E go test -timeout 30m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-e2e-${{ matrix.k3s_version }}.txt

.github/workflows/master-e2e.yaml

@@ -50,7 +50,7 @@ on:
         required: false
 
 env:
-  image_id: ami-00eb69d236edcfaf8
+  image_id: ami-0d9a665f802ae6227
   instance_type: t2.2xlarge
   instance_name: observability-e2e-runner
 
@@ -361,7 +361,7 @@ jobs:
         run: |
           CATTLE_TEST_CONFIG=$GITHUB_WORKSPACE/cattle-config.yaml \
           TEST_LABEL_FILTER=installation \
-          go test -timeout 20m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-installation.txt
+          go test -timeout 30m github.com/rancher/observability-e2e/tests/e2e -v -count=1 -ginkgo.v | tee ~/artifacts/test-output-installation.txt
 
       - name: Run E2E Tests
         id: run_e2e_tests