Use workflow branch for tools in CD (#813)

Author: khanhntd

.github/workflows/CD.yml

@@ -33,6 +33,7 @@ env:
   TF_VAR_aws_secret_access_key: ${{ secrets.INTEG_TEST_AWS_KEY_SECRET }}
   TF_VAR_aoc_vpc_name: aoc-vpc-large
   TF_VAR_aoc_vpc_security_group: aoc-vpc-security-group-large
+  TESTING_FRAMEWORK_REPO: 'aws-observability/aws-otel-collector-test-framework'
 
 jobs:
   release-checking: 
@@ -180,7 +181,7 @@ jobs:
         if: steps.s3-release-validation-1.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
         with:
-          repository: 'aws-observability/aws-otel-collector-test-framework'
+          repository: "${{ env.TESTING_FRAMEWORK_REPO }}"
           path: testing-framework
 
       - name: Run testing suite on ec2
@@ -237,7 +238,7 @@ jobs:
         if: steps.s3-release-validation-2.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
         with:
-          repository: 'aws-observability/aws-otel-collector-test-framework'
+          repository: "${{ env.TESTING_FRAMEWORK_REPO }}"
           path: testing-framework
 
       - name: Run testing suite on ec2
@@ -294,7 +295,7 @@ jobs:
         if: steps.s3-release-validation-3.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
         with:
-          repository: 'aws-observability/aws-otel-collector-test-framework'
+          repository: "${{ env.TESTING_FRAMEWORK_REPO }}"
           path: testing-framework
 
       - name: Run testing suite on ec2
@@ -312,18 +313,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: [release-checking]
     steps:
+      #Since the tools from workflow are always up-to-date with the github workflow, we don't need to use the workflows from the commited sha
+      #but using the workflows from the branch triggered with workflow_dispatch.
+      - uses: actions/checkout@v2
+
+
       - name: Restore cached packages
         uses: actions/cache@v2
         with:
           key: "${{ env.PACKAGE_CACHE_KEY }}"
           path: build/packages
 
-      - name: Checkout the sha
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.inputs.sha }}
-          path: adot
-      
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
@@ -340,7 +340,7 @@ jobs:
         id: version
         run: |
           TAG=`cat build/packages/VERSION`
-          TARGET_VERSION=$TAG bash adot/tools/workflow/docker-version-compare.sh
+          TARGET_VERSION=$TAG bash tools/workflow/docker-version-compare.sh
 
       - name: Load Image
         run: docker load < build/packages/$IMAGE_NAME.tar
@@ -356,7 +356,7 @@ jobs:
             docker push public.ecr.aws/$ECR_REPO:latest
           fi
           if [ ${{ steps.version.outputs.major-update }} == 'true' ] || [ ${{ steps.version.outputs.minor-update }} == 'true' ]; then
-            cd adot/tools/release/adot-operator-images-mirror && go run ./
+            cd tools/release/adot-operator-images-mirror && go run ./
           fi
 
       - name: Login Dockerhub
@@ -420,7 +420,7 @@ jobs:
         if: steps.release-validation-ecs.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
         with:
-          repository: 'aws-observability/aws-otel-collector-test-framework'
+          repository: "${{ env.TESTING_FRAMEWORK_REPO }}"
           path: testing-framework
 
       - name: Run testing suite on ecs
@@ -477,7 +477,7 @@ jobs:
         if: steps.release-validation-eks.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
         with:
-          repository: 'aws-observability/aws-otel-collector-test-framework'
+          repository: "${{ env.TESTING_FRAMEWORK_REPO }}"
           path: testing-framework
 
       - name: Run testing suite on eks