Skip to content

Commit 2c581b7

Browse files
PaurushGargPaurushGarg
authored
Updating Release and Nightly build workflows (#375)
* Updating release and nightly build workflows
1 parent 0bfc6b9 commit 2c581b7

File tree

3 files changed

+75
-20
lines changed

3 files changed

+75
-20
lines changed

‎.github/workflows/nightly-upstream-snapshot-build.yml‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
env:
88
AWS_DEFAULT_REGION: us-east-1
9-
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
9+
IMAGE_TAG: 611364707713.dkr.ecr.us-west-2.amazonaws.com/adot-autoinstrumentation-java-nightly:nightly
1010

1111
permissions:
1212
id-token: write
@@ -23,11 +23,13 @@ jobs:
2323
with:
2424
java-version: 17
2525
- uses: gradle/wrapper-validation-action@v1
26+
2627
- name: Configure AWS Credentials
2728
uses: aws-actions/configure-aws-credentials@v1
2829
with:
2930
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
3031
aws-region: ${{ env.AWS_DEFAULT_REGION }}
32+
3133
- name: Log in to AWS ECR
3234
uses: docker/login-action@v1
3335
with:
@@ -43,6 +45,17 @@ jobs:
4345
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
4446
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
4547

48+
- name: Configure AWS Credentials
49+
uses: aws-actions/configure-aws-credentials@v1
50+
with:
51+
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN_NIGHTLY }}
52+
aws-region: us-west-2
53+
54+
- name: Log in to AWS ECR
55+
uses: docker/login-action@v1
56+
with:
57+
registry: 611364707713.dkr.ecr.us-west-2.amazonaws.com
58+
4659
- name: Get current version
4760
shell: bash
4861
run: |
@@ -61,12 +74,22 @@ jobs:
6174
build-args: "ADOT_JAVA_VERSION=${{ env.ADOT_JAVA_VERSION }}"
6275
context: .
6376
platforms: linux/amd64
64-
tags: ${{ env.TEST_TAG }}
77+
tags: ${{ env.IMAGE_TAG }}
6578
load: true
6679

6780
- name: Test docker image
6881
shell: bash
69-
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.TEST_TAG }}" "${{ env.ADOT_JAVA_VERSION }}"
82+
run: .github/scripts/test-adot-javaagent-image.sh "${{ env.IMAGE_TAG }}" "${{ env.ADOT_JAVA_VERSION }}"
83+
84+
- name: Build and push image
85+
uses: docker/build-push-action@v4
86+
with:
87+
push: true
88+
build-args: "ADOT_JAVA_VERSION=${{ env.ADOT_JAVA_VERSION }}"
89+
context: .
90+
platforms: linux/amd64,linux/arm64
91+
tags: |
92+
${{ env.IMAGE_TAG }}
7093
7194
- name: Upload to GitHub Actions
7295
uses: actions/upload-artifact@v2

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

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,18 @@ jobs:
9191
- name: Build release with Gradle
9292
uses: gradle/gradle-build-action@v2
9393
with:
94-
arguments: build jib final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
95-
env:
96-
PUBLISH_USERNAME: ${{ secrets.PUBLISH_USERNAME }}
97-
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
98-
GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
99-
COMMIT_HASH: ${{ github.event.inputs.version }}
100-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
101-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
94+
arguments: build integrationTests -PlocalDocker=true --stacktrace
95+
96+
- name: Configure AWS Credentials
97+
uses: aws-actions/configure-aws-credentials@v1
98+
with:
99+
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN_RELEASE }}
100+
aws-region: us-west-2
101+
102+
- name: Log in to AWS ECR
103+
uses: docker/login-action@v1
104+
with:
105+
registry: public.ecr.aws
102106

103107
- name: Set up QEMU
104108
uses: docker/setup-qemu-action@v2
@@ -128,7 +132,18 @@ jobs:
128132
context: .
129133
platforms: linux/amd64,linux/arm64
130134
tags: |
131-
public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}, public.ecr.aws/aws-observability/adot-autoinstrumentation-java:latest
135+
public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}
136+
137+
- name: Build and Publish release with Gradle
138+
uses: gradle/gradle-build-action@v2
139+
with:
140+
arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
141+
env:
142+
PUBLISH_USERNAME: ${{ secrets.PUBLISH_USERNAME }}
143+
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
144+
GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
145+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
146+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
132147

133148
- name: Create Release
134149
id: create_release

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

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
with:
3838
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
3939
aws-region: ${{ env.AWS_DEFAULT_REGION }}
40+
4041
- name: Log in to AWS ECR
4142
uses: docker/login-action@v1
4243
with:
@@ -45,13 +46,18 @@ jobs:
4546
- name: Build release with Gradle
4647
uses: gradle/gradle-build-action@v2
4748
with:
48-
arguments: build integrationTests final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} -PlocalDocker=true --stacktrace
49-
env:
50-
PUBLISH_USERNAME: ${{ secrets.PUBLISH_USERNAME }}
51-
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
52-
GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
53-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
54-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
49+
arguments: build integrationTests -PlocalDocker=true --stacktrace
50+
51+
- name: Configure AWS Credentials
52+
uses: aws-actions/configure-aws-credentials@v1
53+
with:
54+
role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN_RELEASE }}
55+
aws-region: us-west-2
56+
57+
- name: Log in to AWS ECR
58+
uses: docker/login-action@v1
59+
with:
60+
registry: public.ecr.aws
5561

5662
- name: Set up QEMU
5763
uses: docker/setup-qemu-action@v2
@@ -81,7 +87,18 @@ jobs:
8187
context: .
8288
platforms: linux/amd64,linux/arm64
8389
tags: |
84-
public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}, public.ecr.aws/aws-observability/adot-autoinstrumentation-java:latest
90+
public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v${{ github.event.inputs.version }}
91+
92+
- name: Build and Publish release with Gradle
93+
uses: gradle/gradle-build-action@v2
94+
with:
95+
arguments: build final closeAndReleaseSonatypeStagingRepository -Prelease.version=${{ github.event.inputs.version }} --stacktrace
96+
env:
97+
PUBLISH_USERNAME: ${{ secrets.PUBLISH_USERNAME }}
98+
PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
99+
GRGIT_USER: ${{ secrets.GITHUB_TOKEN }}
100+
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
101+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
85102

86103
- name: Create Release
87104
id: create_release

0 commit comments

Comments
 (0)