Skip to content

Commit 9b7c347

Browse files
committed
Add ECS E2E into main build.
1 parent f9143b4 commit 9b7c347

File tree

2 files changed

+42
-33
lines changed

2 files changed

+42
-33
lines changed

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

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,35 +41,43 @@ jobs:
4141
- name: Upload main-build adot.whl to s3
4242
run: aws s3 cp ${{ inputs.staging-wheel-name }} s3://adot-main-build-staging-jar/${{ inputs.staging-wheel-name }}
4343

44-
python-ec2-default-e2e-test:
45-
needs: [ upload-main-build ]
46-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
47-
secrets: inherit
48-
with:
49-
aws-region: us-east-1
50-
staging-wheel-name: aws_opentelemetry_distro-0.2.0.dev0-07ca0f26-py3-none-any.whl
51-
caller-workflow-name: 'main-build'
52-
53-
python-ec2-asg-e2e-test:
54-
needs: [ upload-main-build ]
55-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-asg-test.yml@main
56-
secrets: inherit
57-
with:
58-
aws-region: us-east-1
59-
staging-wheel-name: aws_opentelemetry_distro-0.2.0.dev0-07ca0f26-py3-none-any.whl
60-
caller-workflow-name: 'main-build'
61-
62-
python-eks-e2e-test:
63-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
64-
secrets: inherit
65-
with:
66-
aws-region: us-east-1
67-
test-cluster-name: 'e2e-python-adot-test'
68-
adot-image-name: ${{ inputs.adot-image-name }}
69-
caller-workflow-name: 'main-build'
44+
# python-ec2-default-e2e-test:
45+
# needs: [ upload-main-build ]
46+
# uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-default-test.yml@main
47+
# secrets: inherit
48+
# with:
49+
# aws-region: us-east-1
50+
# staging-wheel-name: aws_opentelemetry_distro-0.2.0.dev0-07ca0f26-py3-none-any.whl
51+
# caller-workflow-name: 'main-build'
52+
#
53+
# python-ec2-asg-e2e-test:
54+
# needs: [ upload-main-build ]
55+
# uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ec2-asg-test.yml@main
56+
# secrets: inherit
57+
# with:
58+
# aws-region: us-east-1
59+
# staging-wheel-name: aws_opentelemetry_distro-0.2.0.dev0-07ca0f26-py3-none-any.whl
60+
# caller-workflow-name: 'main-build'
61+
#
62+
# python-eks-e2e-test:
63+
# uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-eks-test.yml@main
64+
# secrets: inherit
65+
# with:
66+
# aws-region: us-east-1
67+
# test-cluster-name: 'e2e-python-adot-test'
68+
# adot-image-name: ${{ inputs.adot-image-name }}
69+
# caller-workflow-name: 'main-build'
70+
#
71+
# python-k8s-e2e-test:
72+
# uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-test.yml@main
73+
# secrets: inherit
74+
# with:
75+
# aws-region: us-east-1
76+
# adot-image-name: ${{ inputs.adot-image-name }}
77+
# caller-workflow-name: 'main-build'
7078

71-
python-k8s-e2e-test:
72-
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-k8s-test.yml@main
79+
python-ecs-e2e-test:
80+
uses: aws-observability/aws-application-signals-test-framework/.github/workflows/python-ecs-test.yml@main
7381
secrets: inherit
7482
with:
7583
aws-region: us-east-1

.github/workflows/main_build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
branches:
66
- main
77
- "release/v*"
8+
- ecs-entry
89
workflow_dispatch: # be able to run the workflow on demand
910
env:
1011
AWS_DEFAULT_REGION: us-east-1
@@ -81,11 +82,11 @@ jobs:
8182
name: ${{ steps.staging_wheel_output.outputs.STAGING_WHEEL}}
8283
path: dist/${{ steps.staging_wheel_output.outputs.STAGING_WHEEL}}
8384

84-
- name: Set up and run contract tests with pytest
85-
run: |
86-
bash scripts/set-up-contract-tests.sh
87-
pip install pytest
88-
pytest contract-tests/tests
85+
# - name: Set up and run contract tests with pytest
86+
# run: |
87+
# bash scripts/set-up-contract-tests.sh
88+
# pip install pytest
89+
# pytest contract-tests/tests
8990

9091
application-signals-e2e-test:
9192
name: "Application Signals E2E Test"

0 commit comments

Comments
 (0)