Test on main build, test on release build.

aws-observability · Dec 16, 2024 · d8923fd · d8923fd
1 parent 36bb681
commit d8923fd
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 48 deletions.
diff --git a/.github/workflows/application-signals-e2e-test.yml b/.github/workflows/application-signals-e2e-test.yml
@@ -45,7 +45,7 @@ jobs:
 
   default-v8-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -55,7 +55,7 @@ jobs:
 
   default-v11-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -65,7 +65,7 @@ jobs:
 
   default-v17-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -75,7 +75,7 @@ jobs:
 
   default-v21-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -85,7 +85,7 @@ jobs:
 
   default-v22-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -99,7 +99,7 @@ jobs:
   #
 
   eks-v8-amd64:
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -110,7 +110,7 @@ jobs:
 
   eks-v11-amd64:
     needs: eks-v8-amd64
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -121,7 +121,7 @@ jobs:
 
   eks-v17-amd64:
     needs: eks-v11-amd64
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -132,7 +132,7 @@ jobs:
 
   eks-v21-amd64:
     needs: eks-v17-amd64
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -143,7 +143,7 @@ jobs:
 
   eks-v22-amd64:
     needs: eks-v21-amd64
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -159,7 +159,7 @@ jobs:
 
   asg-v11-amd64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -172,7 +172,7 @@ jobs:
   #
 
   k8s-v11-amd64:
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -182,7 +182,7 @@ jobs:
 
 
   ecs-v11-amd64:
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -197,7 +197,7 @@ jobs:
 
   default-v11-arm64:
     needs: [ upload-main-build ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1
@@ -211,7 +211,7 @@ jobs:
 
   metric-limiter-v11-amd64:
     needs: [ eks-v22-amd64 ]
-    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
+    uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@adot-java-v2
     secrets: inherit
     with:
       aws-region: us-east-1

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -94,36 +94,36 @@ jobs:
       - name: Test docker image
         shell: bash
         run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
-
-      - name: Build and push image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
-          context: .
-          platforms: linux/amd64,linux/arm64
-          tags: |
-            ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
-            ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
-
-      - name: Build and Publish release with Gradle
-        uses: gradle/gradle-build-action@v3
-        with:
-          arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
-        env:
-          PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
-          PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}
-          GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-
-      - name: Create release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        run: |
-          cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" aws-opentelemetry-agent.jar
-          gh release create --target "$GITHUB_REF_NAME" \
-             --title "Release v${{ github.event.inputs.version }}" \
-             --draft \
-             "v${{ github.event.inputs.version }}" \
-             aws-opentelemetry-agent.jar
+#
+#      - name: Build and push image
+#        uses: docker/build-push-action@v5
+#        with:
+#          push: true
+#          build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
+#          context: .
+#          platforms: linux/amd64,linux/arm64
+#          tags: |
+#            ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
+#            ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
+#
+#      - name: Build and Publish release with Gradle
+#        uses: gradle/gradle-build-action@v3
+#        with:
+#          arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
+#        env:
+#          PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
+#          PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}
+#          GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
+#          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+#          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+#
+#      - name: Create release
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+#        run: |
+#          cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" aws-opentelemetry-agent.jar
+#          gh release create --target "$GITHUB_REF_NAME" \
+#             --title "Release v${{ github.event.inputs.version }}" \
+#             --draft \
+#             "v${{ github.event.inputs.version }}" \
+#             aws-opentelemetry-agent.jar