7
7
env :
8
8
AWS_DEFAULT_REGION : us-east-1
9
9
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
11
12
TESTING_FRAMEWORK_REPO : aws-observability/aws-otel-test-framework
12
13
NUM_BATCHES : 2
13
14
DDB_TABLE_NAME : BatchTestCache
@@ -119,7 +120,6 @@ jobs:
119
120
120
121
- name : Get ADOT_JAVA_AGENT Image Tag
121
122
id : java_agent_versioning
122
- working-directory : aws-otel-java-instrumentation
123
123
run : |
124
124
shortsha="$(git rev-parse --short HEAD)"
125
125
java_agent_tag=${{ env.ADOT_JAVA_VERSION }}-$shortsha
@@ -134,7 +134,7 @@ jobs:
134
134
- name : Login to private staging ecr
135
135
uses : docker/login-action@v2
136
136
with :
137
- registry : ${{ env.STAGING_ECR }}
137
+ registry : ${{ env.STAGING_ECR_REGISTRY }}
138
138
env :
139
139
AWS_REGION : us-west-2
140
140
@@ -146,7 +146,7 @@ jobs:
146
146
context : .
147
147
platforms : linux/amd64,linux/arm64
148
148
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 }}
150
150
151
151
create-test-ref :
152
152
runs-on : ubuntu-latest
@@ -156,7 +156,7 @@ jobs:
156
156
- name : Set testRef output
157
157
id : setRef
158
158
run : |
159
- if [[ ${{ github.ref_name }} == release/v* ]]; then
159
+ if [[ ${{ github.ref_name }} == release/v* ]]; then
160
160
release_version = $(echo ${{ github.ref_name }} | cut -f 2 -d /)
161
161
major_minor = $(echo ${ release_version } | cut -f 1,2 -d .)
162
162
echo "ref = java-release/${major_minor}.x" >> $GITHUB_OUTPUT
@@ -260,7 +260,7 @@ jobs:
260
260
run : |
261
261
export TTL_DATE=${{ steps.date.outputs.ttldate }}
262
262
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 }}"
264
264
export DDB_BATCH_CACHE_SK=${{ needs.build.outputs.java_agent_tag }}
265
265
cd testing-framework/terraform
266
266
make execute-batch-test
0 commit comments