Skip to content

Commit 9d90e35

Browse files
committed
Test Run in Ubuntu 24.04
1 parent 493353a commit 9d90e35

File tree

6 files changed

+58
-52
lines changed

6 files changed

+58
-52
lines changed

.github/workflows/dotnet-ec2-canary.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
name: Dotnet EC2 Enablement Canary Testing
99
on:
1010
workflow_dispatch: # be able to run the workflow on demand
11+
push:
12+
branches:
13+
- 'test-ubuntu-24'
1114
schedule:
1215
- cron: '2,27 * * * *' # run the workflow at 2nd and 27th minute of every hour
1316

@@ -30,13 +33,13 @@ jobs:
3033
aws-region: ${{ matrix.aws-region }}
3134
caller-workflow-name: 'appsignals-dotnet-e2e-ec2-canary-test'
3235

33-
nuget:
34-
strategy:
35-
fail-fast: false
36-
matrix:
37-
aws-region: [ 'us-east-1']
38-
uses: ./.github/workflows/dotnet-ec2-nuget-retry.yml
39-
secrets: inherit
40-
with:
41-
aws-region: ${{ matrix.aws-region }}
42-
caller-workflow-name: 'appsignals-dotnet-e2e-ec2-nuget-canary-test'
36+
# nuget:
37+
# strategy:
38+
# fail-fast: false
39+
# matrix:
40+
# aws-region: [ 'us-east-1']
41+
# uses: ./.github/workflows/dotnet-ec2-nuget-retry.yml
42+
# secrets: inherit
43+
# with:
44+
# aws-region: ${{ matrix.aws-region }}
45+
# caller-workflow-name: 'appsignals-dotnet-e2e-ec2-nuget-canary-test'

.github/workflows/dotnet-ec2-default-retry.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@ jobs:
3535
with:
3636
aws-region: ${{ inputs.aws-region }}
3737
caller-workflow-name: ${{ inputs.caller-workflow-name }}
38-
39-
publish-metric-attempt-1:
40-
needs: [ dotnet-ec2-default-attempt-1, dotnet-ec2-default-attempt-2 ]
41-
if: always()
42-
uses: ./.github/workflows/enablement-test-publish-result.yml
43-
secrets: inherit
44-
with:
45-
aws-region: ${{ inputs.aws-region }}
46-
caller-workflow-name: ${{ inputs.caller-workflow-name }}
47-
validation-result: ${{ needs.dotnet-ec2-default-attempt-1.outputs.validation-result || needs.dotnet-ec2-default-attempt-2.outputs.validation-result }}
48-
49-
publish-metric-attempt-2:
50-
needs: [ dotnet-ec2-default-attempt-1, dotnet-ec2-default-attempt-2, publish-metric-attempt-1 ]
51-
if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }}
52-
uses: ./.github/workflows/enablement-test-publish-result.yml
53-
secrets: inherit
54-
with:
55-
aws-region: ${{ inputs.aws-region }}
56-
caller-workflow-name: ${{ inputs.caller-workflow-name }}
57-
validation-result: ${{ needs.dotnet-ec2-default-attempt-1.outputs.validation-result || needs.dotnet-ec2-default-attempt-2.outputs.validation-result }}
38+
#
39+
# publish-metric-attempt-1:
40+
# needs: [ dotnet-ec2-default-attempt-1, dotnet-ec2-default-attempt-2 ]
41+
# if: always()
42+
# uses: ./.github/workflows/enablement-test-publish-result.yml
43+
# secrets: inherit
44+
# with:
45+
# aws-region: ${{ inputs.aws-region }}
46+
# caller-workflow-name: ${{ inputs.caller-workflow-name }}
47+
# validation-result: ${{ needs.dotnet-ec2-default-attempt-1.outputs.validation-result || needs.dotnet-ec2-default-attempt-2.outputs.validation-result }}
48+
#
49+
# publish-metric-attempt-2:
50+
# needs: [ dotnet-ec2-default-attempt-1, dotnet-ec2-default-attempt-2, publish-metric-attempt-1 ]
51+
# if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }}
52+
# uses: ./.github/workflows/enablement-test-publish-result.yml
53+
# secrets: inherit
54+
# with:
55+
# aws-region: ${{ inputs.aws-region }}
56+
# caller-workflow-name: ${{ inputs.caller-workflow-name }}
57+
# validation-result: ${{ needs.dotnet-ec2-default-attempt-1.outputs.validation-result || needs.dotnet-ec2-default-attempt-2.outputs.validation-result }}

.github/workflows/dotnet-ec2-default-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ env:
4040

4141
jobs:
4242
dotnet-ec2-default:
43-
runs-on: ubuntu-latest
43+
runs-on: ubuntu-24.04
4444
timeout-minutes: 30
4545
outputs:
4646
job-started: ${{ steps.job-started.outputs.job-started }}

.github/workflows/python-ec2-canary.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ name: Python EC2 Enablement Canary Testing
99
on:
1010
schedule:
1111
- cron: '16,41 * * * *' # run the workflow at 16th and 41th minute of every hour
12+
push:
13+
branches:
14+
- 'test-ubuntu-24'
1215
workflow_dispatch: # be able to run the workflow on demand
1316

1417
permissions:

.github/workflows/python-ec2-default-retry.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,23 @@ jobs:
5858
staging-wheel-name: ${{ inputs.staging-wheel-name }}
5959
otel-source: ${{ inputs.otel-source }}
6060
cpu-architecture: ${{ inputs.cpu-architecture }}
61-
62-
publish-metric-attempt-1:
63-
needs: [ python-ec2-default-attempt-1, python-ec2-default-attempt-2 ]
64-
if: always()
65-
uses: ./.github/workflows/enablement-test-publish-result.yml
66-
secrets: inherit
67-
with:
68-
aws-region: ${{ inputs.aws-region }}
69-
caller-workflow-name: ${{ inputs.caller-workflow-name }}
70-
validation-result: ${{ needs.python-ec2-default-attempt-1.outputs.validation-result || needs.python-ec2-default-attempt-2.outputs.validation-result }}
71-
72-
publish-metric-attempt-2:
73-
needs: [ python-ec2-default-attempt-1, python-ec2-default-attempt-2, publish-metric-attempt-1 ]
74-
if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }}
75-
uses: ./.github/workflows/enablement-test-publish-result.yml
76-
secrets: inherit
77-
with:
78-
aws-region: ${{ inputs.aws-region }}
79-
caller-workflow-name: ${{ inputs.caller-workflow-name }}
80-
validation-result: ${{ needs.python-ec2-default-attempt-1.outputs.validation-result || needs.python-ec2-default-attempt-2.outputs.validation-result }}
61+
#
62+
# publish-metric-attempt-1:
63+
# needs: [ python-ec2-default-attempt-1, python-ec2-default-attempt-2 ]
64+
# if: always()
65+
# uses: ./.github/workflows/enablement-test-publish-result.yml
66+
# secrets: inherit
67+
# with:
68+
# aws-region: ${{ inputs.aws-region }}
69+
# caller-workflow-name: ${{ inputs.caller-workflow-name }}
70+
# validation-result: ${{ needs.python-ec2-default-attempt-1.outputs.validation-result || needs.python-ec2-default-attempt-2.outputs.validation-result }}
71+
#
72+
# publish-metric-attempt-2:
73+
# needs: [ python-ec2-default-attempt-1, python-ec2-default-attempt-2, publish-metric-attempt-1 ]
74+
# if: ${{ always() && needs.publish-metric-attempt-1.outputs.job-started != 'true' }}
75+
# uses: ./.github/workflows/enablement-test-publish-result.yml
76+
# secrets: inherit
77+
# with:
78+
# aws-region: ${{ inputs.aws-region }}
79+
# caller-workflow-name: ${{ inputs.caller-workflow-name }}
80+
# validation-result: ${{ needs.python-ec2-default-attempt-1.outputs.validation-result || needs.python-ec2-default-attempt-2.outputs.validation-result }}

.github/workflows/python-ec2-default-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ env:
5858

5959
jobs:
6060
python-ec2-default:
61-
runs-on: ubuntu-latest
61+
runs-on: ubuntu-24.04
6262
timeout-minutes: 30
6363
outputs:
6464
job-started: ${{ steps.job-started.outputs.job-started }}

0 commit comments

Comments
 (0)