Skip to content

Commit ce5ff49

Browse files
authored
Merge pull request #3138 from craig8/update-test-times
Culmination of 9.x items.
2 parents b9e68f2 + 39c3e30 commit ce5ff49

30 files changed

+295
-406
lines changed

.github/workflows/code_analysis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
schedule:
2121
- cron: '25 18 * * 2'
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
25+
cancel-in-progress: true
26+
2327
jobs:
2428
analyze:
2529
name: Analyze

.github/workflows/pytest-auth.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,21 @@
1414
name: Testing platform auth
1515

1616
# Determine what events are going to trigger a running of the workflow
17-
on: [pull_request]
17+
on:
18+
workflow_dispatch:
19+
push:
20+
branches:
21+
- develop
22+
- releases/**
23+
pull_request:
24+
branches:
25+
- main
26+
- develop
27+
- releases/**
28+
29+
concurrency:
30+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
31+
cancel-in-progress: true
1832

1933
jobs:
2034
# The job named build

.github/workflows/pytest-dbutils-backup_db.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,20 @@ name: Testing BackupDatabase
1515

1616
# Determine what events are going to trigger a running of the workflow
1717
on:
18+
workflow_dispatch:
1819
push:
1920
branches:
2021
- develop
2122
- releases/**
2223
pull_request:
2324
branches:
24-
- main
25-
- develop
26-
- releases/**
25+
- main
26+
- develop
27+
- releases/**
28+
29+
concurrency:
30+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
31+
cancel-in-progress: true
2732

2833
jobs:
2934
build:

.github/workflows/pytest-dbutils-influxdbfuncts.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@
77

88
name: Testing influxdbutils
99
on:
10+
workflow_dispatch:
1011
push:
1112
branches:
1213
- develop
1314
- releases/**
1415
pull_request:
1516
branches:
16-
- main
17-
- develop
18-
- releases/**
17+
- main
18+
- develop
19+
- releases/**
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
22+
cancel-in-progress: true
1923

2024
jobs:
2125
build:

.github/workflows/pytest-dbutils-mysqlfuncts.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@
77

88
name: Testing mysqlfuncts
99
on:
10+
workflow_dispatch:
1011
push:
1112
branches:
1213
- develop
1314
- releases/**
1415
pull_request:
1516
branches:
16-
- main
17-
- develop
18-
- releases/**
17+
- main
18+
- develop
19+
- releases/**
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
22+
cancel-in-progress: true
1923

2024
jobs:
2125
build:

.github/workflows/pytest-dbutils-postgresqlfuncts.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@
77

88
name: Testing postgresqlfuncts
99
on:
10+
workflow_dispatch:
1011
push:
1112
branches:
1213
- develop
1314
- releases/**
1415
pull_request:
1516
branches:
16-
- main
17-
- develop
18-
- releases/**
17+
- main
18+
- develop
19+
- releases/**
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
22+
cancel-in-progress: true
1923

2024
jobs:
2125
build:

.github/workflows/pytest-dbutils-sqlitefuncts.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77

88
name: Testing sqlitefuncts
99
on:
10+
workflow_dispatch:
1011
push:
1112
branches:
1213
- develop
1314
- releases/**
1415
pull_request:
1516
branches:
16-
- main
17-
- develop
18-
- releases/**
19-
17+
- main
18+
- develop
19+
- releases/**
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
22+
cancel-in-progress: true
2023
jobs:
2124
build:
2225
env:

.github/workflows/pytest-dbutils-timescaldbfuncts.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77

88
name: Testing postgresql_timescaledb_functs
99
on:
10+
workflow_dispatch:
1011
push:
1112
branches:
1213
- develop
1314
- releases/**
1415
pull_request:
1516
branches:
16-
- main
17-
- develop
18-
- releases/**
19-
17+
- main
18+
- develop
19+
- releases/**
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
22+
cancel-in-progress: true
2023
jobs:
2124
build:
2225
env:

.github/workflows/pytest-miscellaneous-tests.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@
1414
name: Miscellaneous platform tests
1515

1616
on:
17+
workflow_dispatch:
1718
push:
1819
branches:
1920
- develop
2021
- releases/**
2122
pull_request:
2223
branches:
23-
- main
24-
- develop
25-
- releases/**
26-
24+
- main
25+
- develop
26+
- releases/**
27+
concurrency:
28+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
29+
cancel-in-progress: true
2730
jobs:
2831
# The job named build
2932
build:
@@ -32,10 +35,10 @@ jobs:
3235
strategy:
3336
fail-fast: false
3437
matrix:
35-
# Each entry in the os and python-version matrix will be run
38+
# Each entry in the os and python-version matrix will be run
3639
os: [ ubuntu-20.04 ]
3740
python-version: [ 3.8 ]
38-
41+
3942
# Run-on determines the operating system available to run on
4043
# - At the current time there is only ubuntu machine 20.04 available
4144
# - This uses the matrix os from the strategy above
@@ -60,33 +63,33 @@ jobs:
6063
os: ${{ matrix.os }}
6164
test_path: volttrontesting/platform/web/test_certs.py
6265
test_output_suffix: misc
63-
66+
6467
- name: Run core agent test on ${{ matrix.python-version }}, ${{ matrix.os }}
65-
uses: volttron/volttron-build-action@v5
68+
uses: volttron/volttron-build-action@v6
6669
with:
6770
python_version: ${{ matrix.python-version }}
6871
os: ${{ matrix.os }}
6972
test_path: volttrontesting/platform/test_core_agent.py
7073
test_output_suffix: misc
7174

7275
- name: Run packaging test on ${{ matrix.python-version }}, ${{ matrix.os }}
73-
uses: volttron/volttron-build-action@v5
76+
uses: volttron/volttron-build-action@v6
7477
with:
7578
python_version: ${{ matrix.python-version }}
7679
os: ${{ matrix.os }}
7780
test_path: volttrontesting/platform/test_packaging.py
7881
test_output_suffix: misc
7982

8083
- name: Run platform init test on ${{ matrix.python-version }}, ${{ matrix.os }}
81-
uses: volttron/volttron-build-action@v5
84+
uses: volttron/volttron-build-action@v6
8285
with:
8386
python_version: ${{ matrix.python-version }}
8487
os: ${{ matrix.os }}
8588
test_path: volttrontesting/platform/test_platform_init.py
8689
test_output_suffix: misc
87-
90+
8891
- name: Run sqlite3 test on ${{ matrix.python-version }}, ${{ matrix.os }}
89-
uses: volttron/volttron-build-action@v5
92+
uses: volttron/volttron-build-action@v6
9093
with:
9194
python_version: ${{ matrix.python-version }}
9295
os: ${{ matrix.os }}

.github/workflows/pytest-testutils.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@
99

1010
name: Testing testutils directory
1111
on:
12+
workflow_dispatch:
1213
push:
1314
branches:
1415
- develop
1516
- releases/**
1617
pull_request:
1718
branches:
18-
- main
19-
- develop
20-
- releases/**
21-
19+
- main
20+
- develop
21+
- releases/**
22+
concurrency:
23+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
24+
cancel-in-progress: true
2225
jobs:
2326
build:
2427
# The strategy allows customization of the build and allows matrixing the version of os and software

0 commit comments

Comments
 (0)