Skip to content

Commit 1897415

Browse files
authored
Fix: fix workflow (#464)
Signed-off-by: Raphael Silva <[email protected]>
1 parent 05cd404 commit 1897415

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/main-build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77
env:
88
AWS_DEFAULT_REGION: us-east-1
99
TEST_TAG: public.ecr.aws/aws-observability/adot-autoinstrumentation-java:test
10-
STAGING_ECR: 611364707713.dkr.ecr.us-west-2.amazonaws.com/adot-autoinstrumentation-java-operator-staging
10+
STAGING_ECR_REGISTRY: 611364707713.dkr.ecr.us-west-2.amazonaws.com
11+
STAGING_ECR_REPOSITORY: adot-autoinstrumentation-java-operator-staging
1112
TESTING_FRAMEWORK_REPO: aws-observability/aws-otel-test-framework
1213
NUM_BATCHES: 2
1314
DDB_TABLE_NAME: BatchTestCache
@@ -119,7 +120,6 @@ jobs:
119120

120121
- name: Get ADOT_JAVA_AGENT Image Tag
121122
id: java_agent_versioning
122-
working-directory: aws-otel-java-instrumentation
123123
run: |
124124
shortsha="$(git rev-parse --short HEAD)"
125125
java_agent_tag=${{ env.ADOT_JAVA_VERSION }}-$shortsha
@@ -134,7 +134,7 @@ jobs:
134134
- name: Login to private staging ecr
135135
uses: docker/login-action@v2
136136
with:
137-
registry: ${{ env.STAGING_ECR }}
137+
registry: ${{ env.STAGING_ECR_REGISTRY }}
138138
env:
139139
AWS_REGION: us-west-2
140140

@@ -146,7 +146,7 @@ jobs:
146146
context: .
147147
platforms: linux/amd64,linux/arm64
148148
tags: |
149-
${{ env.STAGING_ECR }}:${{ steps.java_agent_versioning.outputs.STAGING_TAG }}
149+
${{ env.STAGING_ECR_REGISTRY }}/${{ env.STAGING_ECR_REPOSITORY }}:${{ steps.java_agent_versioning.outputs.STAGING_TAG }}
150150
151151
create-test-ref:
152152
runs-on: ubuntu-latest
@@ -156,7 +156,7 @@ jobs:
156156
- name: Set testRef output
157157
id: setRef
158158
run: |
159-
if [[ ${{ github.ref_name }} == release/v* ]]; then
159+
if [[ ${{ github.ref_name }} == release/v* ]]; then
160160
release_version = $(echo ${{ github.ref_name }} | cut -f 2 -d /)
161161
major_minor = $(echo ${ release_version } | cut -f 1,2 -d .)
162162
echo "ref = java-release/${major_minor}.x" >> $GITHUB_OUTPUT
@@ -260,7 +260,7 @@ jobs:
260260
run: |
261261
export TTL_DATE=${{ steps.date.outputs.ttldate }}
262262
export TF_VAR_JAVA_AUTO_INSTRUMENTATION_TAG=${{ needs.build.outputs.java_agent_tag }}
263-
export TF_VAR_JAVA_AUTO_INSTRUMENTATION_REPOSITORY=${{ env.STAGING_ECR }}
263+
export TF_VAR_JAVA_AUTO_INSTRUMENTATION_REPOSITORY="${{ env.STAGING_ECR_REGISTRY }}/${{ env.STAGING_ECR_REPOSITORY }}"
264264
export DDB_BATCH_CACHE_SK=${{ needs.build.outputs.java_agent_tag }}
265265
cd testing-framework/terraform
266266
make execute-batch-test

0 commit comments

Comments
 (0)