Skip to content

Commit d8923fd

Browse files
zzhloginzzhlogin
committed
Test on main build, test on release build.
1 parent 36bb681 commit d8923fd

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

‎.github/workflows/application-signals-e2e-test.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
default-v8-amd64:
4747
needs: [ upload-main-build ]
48-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
48+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
4949
secrets: inherit
5050
with:
5151
aws-region: us-east-1
@@ -55,7 +55,7 @@ jobs:
5555

5656
default-v11-amd64:
5757
needs: [ upload-main-build ]
58-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
58+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
5959
secrets: inherit
6060
with:
6161
aws-region: us-east-1
@@ -65,7 +65,7 @@ jobs:
6565

6666
default-v17-amd64:
6767
needs: [ upload-main-build ]
68-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
68+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
6969
secrets: inherit
7070
with:
7171
aws-region: us-east-1
@@ -75,7 +75,7 @@ jobs:
7575

7676
default-v21-amd64:
7777
needs: [ upload-main-build ]
78-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
78+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
7979
secrets: inherit
8080
with:
8181
aws-region: us-east-1
@@ -85,7 +85,7 @@ jobs:
8585

8686
default-v22-amd64:
8787
needs: [ upload-main-build ]
88-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
88+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
8989
secrets: inherit
9090
with:
9191
aws-region: us-east-1
@@ -99,7 +99,7 @@ jobs:
9999
#
100100

101101
eks-v8-amd64:
102-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
102+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
103103
secrets: inherit
104104
with:
105105
aws-region: us-east-1
@@ -110,7 +110,7 @@ jobs:
110110

111111
eks-v11-amd64:
112112
needs: eks-v8-amd64
113-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
113+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
114114
secrets: inherit
115115
with:
116116
aws-region: us-east-1
@@ -121,7 +121,7 @@ jobs:
121121

122122
eks-v17-amd64:
123123
needs: eks-v11-amd64
124-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
124+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
125125
secrets: inherit
126126
with:
127127
aws-region: us-east-1
@@ -132,7 +132,7 @@ jobs:
132132

133133
eks-v21-amd64:
134134
needs: eks-v17-amd64
135-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
135+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
136136
secrets: inherit
137137
with:
138138
aws-region: us-east-1
@@ -143,7 +143,7 @@ jobs:
143143

144144
eks-v22-amd64:
145145
needs: eks-v21-amd64
146-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@main
146+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-eks-test.yml@adot-java-v2
147147
secrets: inherit
148148
with:
149149
aws-region: us-east-1
@@ -159,7 +159,7 @@ jobs:
159159

160160
asg-v11-amd64:
161161
needs: [ upload-main-build ]
162-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@main
162+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-asg-test.yml@adot-java-v2
163163
secrets: inherit
164164
with:
165165
aws-region: us-east-1
@@ -172,7 +172,7 @@ jobs:
172172
#
173173

174174
k8s-v11-amd64:
175-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@main
175+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-k8s-test.yml@adot-java-v2
176176
secrets: inherit
177177
with:
178178
aws-region: us-east-1
@@ -182,7 +182,7 @@ jobs:
182182

183183

184184
ecs-v11-amd64:
185-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@main
185+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ecs-test.yml@adot-java-v2
186186
secrets: inherit
187187
with:
188188
aws-region: us-east-1
@@ -197,7 +197,7 @@ jobs:
197197

198198
default-v11-arm64:
199199
needs: [ upload-main-build ]
200-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@main
200+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/java-ec2-default-test.yml@adot-java-v2
201201
secrets: inherit
202202
with:
203203
aws-region: us-east-1
@@ -211,7 +211,7 @@ jobs:
211211

212212
metric-limiter-v11-amd64:
213213
needs: [ eks-v22-amd64 ]
214-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@main
214+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/metric-limiter-test.yml@adot-java-v2
215215
secrets: inherit
216216
with:
217217
aws-region: us-east-1

‎.github/workflows/release-build.yml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -94,36 +94,36 @@ jobs:
9494
- name: Test docker image
9595
shell: bash
9696
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ github.event.inputs.version }}"
97-
98-
- name: Build and push image
99-
uses: docker/build-push-action@v5
100-
with:
101-
push: true
102-
build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
103-
context: .
104-
platforms: linux/amd64,linux/arm64
105-
tags: |
106-
${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
107-
${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
108-
109-
- name: Build and Publish release with Gradle
110-
uses: gradle/gradle-build-action@v3
111-
with:
112-
arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
113-
env:
114-
PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
115-
PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}
116-
GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
117-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
118-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
119-
120-
- name: Create release
121-
env:
122-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
123-
run: |
124-
cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" aws-opentelemetry-agent.jar
125-
gh release create --target "$GITHUB_REF_NAME" \
126-
--title "Release v${{ github.event.inputs.version }}" \
127-
--draft \
128-
"v${{ github.event.inputs.version }}" \
129-
aws-opentelemetry-agent.jar
97+
#
98+
# - name: Build and push image
99+
# uses: docker/build-push-action@v5
100+
# with:
101+
# push: true
102+
# build-args: "ADOT_JAVA_VERSION=${{ github.event.inputs.version }}"
103+
# context: .
104+
# platforms: linux/amd64,linux/arm64
105+
# tags: |
106+
# ${{ env.PUBLIC_REPOSITORY }}:v${{ github.event.inputs.version }}
107+
# ${{ env.PRIVATE_REPOSITORY }}:v${{ github.event.inputs.version }}
108+
#
109+
# - name: Build and Publish release with Gradle
110+
# uses: gradle/gradle-build-action@v3
111+
# with:
112+
# arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
113+
# env:
114+
# PUBLISH_TOKEN_USERNAME: ${{ secrets.PUBLISH_TOKEN_USERNAME }}
115+
# PUBLISH_TOKEN_PASSWORD: ${{ secrets.PUBLISH_TOKEN_PASSWORD }}
116+
# GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
117+
# GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
118+
# GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
119+
#
120+
# - name: Create release
121+
# env:
122+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
123+
# run: |
124+
# cp "otelagent/build/libs/aws-opentelemetry-agent-${{ github.event.inputs.version }}.jar" aws-opentelemetry-agent.jar
125+
# gh release create --target "$GITHUB_REF_NAME" \
126+
# --title "Release v${{ github.event.inputs.version }}" \
127+
# --draft \
128+
# "v${{ github.event.inputs.version }}" \
129+
# aws-opentelemetry-agent.jar

0 commit comments

Comments
 (0)