From 00d1151510ee3d0b7577e56654362a2027701aa6 Mon Sep 17 00:00:00 2001
From: Raphael Silva <rapphil@gmail.com>
Date: Tue, 22 Nov 2022 01:16:12 +0000
Subject: [PATCH 1/3] Use different test framework branch for dev branch

Signed-off-by: Raphael Silva <rapphil@gmail.com>
---
 .github/workflows/CI-Operator.yml | 2 +-
 .github/workflows/CI.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI-Operator.yml b/.github/workflows/CI-Operator.yml
index c5948bab8d..9856f430a1 100644
--- a/.github/workflows/CI-Operator.yml
+++ b/.github/workflows/CI-Operator.yml
@@ -57,7 +57,7 @@ jobs:
       - name: Set testRef output
         id: setRef
         run: |
-          if [[ ${{ github.ref_name }} == release/v* ]]; then 
+          if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then
             echo "::set-output name=ref::${{github.ref_name}}"
           else
             echo "::set-output name=ref::terraform"
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index aa5693dc6c..9766c1ebde 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Set testRef output
         id: setRef
         run: |
-          if [[ ${{ github.ref_name }} == release/v* ]]; then 
+          if [[ ${{ github.ref_name }} == release/v* ]] || [[ ${{ github.ref_name }} == dev ]]; then
             echo "::set-output name=ref::${{github.ref_name}}"
           else
             echo "::set-output name=ref::terraform"

From 0b77c84c1c52271b036a0ea60618adadc61fbe81 Mon Sep 17 00:00:00 2001
From: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Date: Tue, 22 Nov 2022 15:09:01 -0800
Subject: [PATCH 2/3] Enable only EC2 tests for the dev branch.

---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 9766c1ebde..18ab375d16 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -49,7 +49,7 @@ env:
   GITHB_RUN_ID: ${{ github.run_id }}
   DDB_TABLE_NAME: BatchTestCache
   MAX_JOBS: 90
-  BATCH_INCLUDED_SERVICES: EKS,ECS,EC2,EKS_ARM64,EKS_FARGATE
+  BATCH_INCLUDED_SERVICES: EC2
   GO_VERSION: ~1.18.8
 
 

From c98bc2df1799f40923d520d4f2bc1ea4daf1083d Mon Sep 17 00:00:00 2001
From: Raphael Silva <rapphil@gmail.com>
Date: Tue, 22 Nov 2022 23:18:36 +0000
Subject: [PATCH 3/3] Remove release candidate

Signed-off-by: Raphael Silva <rapphil@gmail.com>
---
 .github/workflows/CI.yml | 41 ++--------------------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 18ab375d16..34f9ba1bf2 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -723,46 +723,9 @@ jobs:
           cd testing-framework/terraform
           make checkCacheHits
 
-  release-candidate:
-    runs-on: ubuntu-latest
-    if: ${{ always() && needs.validate-all-tests-pass.result == 'success' }}
-    needs: validate-all-tests-pass
-    steps:
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
-        with:
-          role-to-assume: ${{ secrets.COLLECTOR_ASSUMABLE_ROLE_ARN }}
-          aws-region: us-west-2
-
-      - name: restore cached packages
-        uses: actions/cache@v3
-        with:
-          path: "${{ env.PACKAGING_ROOT }}"
-          key: "cached_packages_${{ github.run_id }}"
-
-      - name: prepare production version
-        run: |
-          TESTING_VERSION=`cat $PACKAGING_ROOT/VERSION`
-          VERSION=`echo $TESTING_VERSION | awk -F "-" '{print $1}'`
-          echo $VERSION > $PACKAGING_ROOT/VERSION
-          echo $GITHUB_SHA > $PACKAGING_ROOT/GITHUB_SHA
-          echo $TESTING_VERSION > $PACKAGING_ROOT/TESTING_VERSION
-
-      - name: upload packages as release candidate on s3
-        run: |
-          tar czvf $GITHUB_SHA.tar.gz build
-          aws s3 cp $GITHUB_SHA.tar.gz s3://aws-otel-collector-release-candidate/$GITHUB_SHA.tar.gz
-
-      - name: Trigger performance test
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: "${{ secrets.REPO_WRITE_ACCESS_TOKEN }}"
-          event-type: trigger-perf
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
-
   publish-ci-status:
     runs-on: ubuntu-latest
-    needs: [release-candidate]
+    needs: [validate-all-tests-pass]
     if: always()
     steps:
       - name: Configure AWS Credentials
@@ -773,7 +736,7 @@ jobs:
 
       - name: Publish CI status
         run: |
-          if [ '${{ needs.release-candidate.result }}' = 'success' ]; then
+          if [ '${{ needs.validate-all-tests-pass.result }}' = 'success' ]; then
             aws cloudwatch put-metric-data --namespace 'ADOT/GitHubActions' \
               --metric-name Success \
               --dimensions repository=${{ github.repository }},branch=${{ github.ref_name }},workflow=CI \