Skip to content

Commit 7459c17

Browse files
authored
Merge pull request #3212 from VOLTTRON/releases/9.0.4
Releases/9.0.4
2 parents 7b5339b + a551f80 commit 7459c17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+541
-1396
lines changed

.github/workflows/pytest-auth.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
42-
os: [ ubuntu-20.04 ]
43-
python-version: [ 3.8 ]
42+
os: [ ubuntu-22.04 ]
43+
python-version: [ '3.10' ]
4444

4545
# Run-on determines the operating system available to run on
4646
# - At the current time there is only ubuntu machines between 16.04 and 20.04 available
@@ -60,7 +60,7 @@ jobs:
6060

6161
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
6262
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
63-
uses: volttron/volttron-build-action@v6
63+
uses: volttron/volttron-build-action@no_rmq
6464
with:
6565
python_version: ${{ matrix.python-version }}
6666
os: ${{ matrix.os }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
# Each entry in the os and python-version matrix will be run. For example, on a list of 3 os's and 4 python versions, 12 jobs will be run
44-
os: [ ubuntu-20.04 ]
45-
python-version: [ 3.8 ]
44+
os: [ ubuntu-22.04 ]
45+
python-version: [ '3.10' ]
4646

4747
# Run-on determines the operating system available to run on
4848
# - At the current time there is only ubuntu machines between 16.04 and 20.04 available
@@ -65,7 +65,7 @@ jobs:
6565
6666
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
6767
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
68-
uses: volttron/volttron-build-action@v6
68+
uses: volttron/volttron-build-action@no_rmq
6969
timeout-minutes: 600
7070
with:
7171
python_version: ${{ matrix.python-version }}

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

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
35-
os: [ ubuntu-20.04 ]
36-
python-version: [ 3.8 ]
35+
os: [ ubuntu-22.04 ]
36+
python-version: [ '3.10' ]
3737

3838
runs-on: ${{ matrix.os }}
3939

@@ -54,7 +54,7 @@ jobs:
5454
5555
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
5656
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
57-
uses: volttron/volttron-build-action@v6
57+
uses: volttron/volttron-build-action@no_rmq
5858
timeout-minutes: 600
5959
with:
6060
python_version: ${{ matrix.python-version }}

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

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,30 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
35-
os: [ ubuntu-20.04 ]
36-
python-version: [ 3.8 ]
35+
os: [ ubuntu-22.04 ]
36+
python-version: [ '3.10' ]
3737

3838
runs-on: ${{ matrix.os }}
3939

40+
services:
41+
# Label used to access the service container
42+
postgres:
43+
# Docker Hub image
44+
image: postgres
45+
# Provide the password for postgres
46+
env:
47+
POSTGRES_PASSWORD: postgres
48+
ports:
49+
# Maps tcp port 5432 on service container to the host
50+
- 5432:5432
51+
timescale:
52+
image: timescale/timescaledb:latest-pg15
53+
env:
54+
POSTGRES_PASSWORD: postgres
55+
ports:
56+
# Maps tcp port 5432 on service container to the host
57+
- 5433:5432
58+
4059
steps:
4160
# checkout the volttron repository and set current directory to it
4261
- uses: actions/checkout@v4
@@ -51,10 +70,19 @@ jobs:
5170
- name: Create output suffix
5271
run: |
5372
echo "OUTPUT_SUFFIX=$(basename $TEST_FILE)" >> $GITHUB_ENV
54-
73+
74+
- name: Create test historian database
75+
run: |
76+
PGPASSWORD="postgres" psql -U postgres -h localhost -p 5432 -c "CREATE DATABASE test_historian;"
77+
PGPASSWORD="postgres" psql -U postgres -h localhost -p 5433 -c "CREATE DATABASE test_historian;"
78+
env:
79+
# The hostname used to communicate with the PostgreSQL service container
80+
POSTGRES_HOST: localhost
81+
POSTGRES_PASSWORD: postgres
82+
5583
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
5684
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
57-
uses: volttron/volttron-build-action@v6
85+
uses: volttron/volttron-build-action@no_rmq
5886
timeout-minutes: 600
5987
with:
6088
python_version: ${{ matrix.python-version }}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
34-
os: [ ubuntu-20.04 ]
35-
python-version: [ 3.8 ]
34+
os: [ ubuntu-22.04 ]
35+
python-version: [ '3.10' ]
36+
3637

3738
runs-on: ${{ matrix.os }}
3839

@@ -54,7 +55,7 @@ jobs:
5455
5556
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
5657
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
57-
uses: volttron/volttron-build-action@v6
58+
uses: volttron/volttron-build-action@no_rmq
5859
timeout-minutes: 600
5960
with:
6061
python_version: ${{ matrix.python-version }}

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

Lines changed: 0 additions & 71 deletions
This file was deleted.

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
# Each entry in the os and python-version matrix will be run
39-
os: [ ubuntu-20.04 ]
40-
python-version: [ 3.8 ]
39+
os: [ ubuntu-22.04 ]
40+
python-version: [ '3.10' ]
4141

4242
# Run-on determines the operating system available to run on
4343
# - At the current time there is only ubuntu machine 20.04 available
@@ -57,39 +57,39 @@ jobs:
5757

5858
# Run the specified tests and save the results to a unique file that can be archived for later analysis
5959
- name: Run certs test on ${{ matrix.python-version }}, ${{ matrix.os }}
60-
uses: volttron/volttron-build-action@v6
60+
uses: volttron/volttron-build-action@no_rmq
6161
with:
6262
python_version: ${{ matrix.python-version }}
6363
os: ${{ matrix.os }}
6464
test_path: volttrontesting/platform/web/test_certs.py
6565
test_output_suffix: misc
6666

6767
- name: Run core agent test on ${{ matrix.python-version }}, ${{ matrix.os }}
68-
uses: volttron/volttron-build-action@v6
68+
uses: volttron/volttron-build-action@no_rmq
6969
with:
7070
python_version: ${{ matrix.python-version }}
7171
os: ${{ matrix.os }}
7272
test_path: volttrontesting/platform/test_core_agent.py
7373
test_output_suffix: misc
7474

7575
- name: Run packaging test on ${{ matrix.python-version }}, ${{ matrix.os }}
76-
uses: volttron/volttron-build-action@v6
76+
uses: volttron/volttron-build-action@no_rmq
7777
with:
7878
python_version: ${{ matrix.python-version }}
7979
os: ${{ matrix.os }}
8080
test_path: volttrontesting/platform/test_packaging.py
8181
test_output_suffix: misc
8282

8383
- name: Run platform init test on ${{ matrix.python-version }}, ${{ matrix.os }}
84-
uses: volttron/volttron-build-action@v6
84+
uses: volttron/volttron-build-action@no_rmq
8585
with:
8686
python_version: ${{ matrix.python-version }}
8787
os: ${{ matrix.os }}
8888
test_path: volttrontesting/platform/test_platform_init.py
8989
test_output_suffix: misc
9090

9191
- name: Run sqlite3 test on ${{ matrix.python-version }}, ${{ matrix.os }}
92-
uses: volttron/volttron-build-action@v6
92+
uses: volttron/volttron-build-action@no_rmq
9393
with:
9494
python_version: ${{ matrix.python-version }}
9595
os: ${{ matrix.os }}

.github/workflows/pytest-testutils.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
33-
os: [ ubuntu-20.04 ]
34-
python-version: [ 3.8 ]
33+
os: [ ubuntu-22.04 ]
34+
python-version: [ '3.10' ]
3535

3636
runs-on: ${{ matrix.os }}
3737

@@ -48,7 +48,7 @@ jobs:
4848

4949
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
5050
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
51-
uses: volttron/volttron-build-action@v6
51+
uses: volttron/volttron-build-action@no_rmq
5252
with:
5353
python_version: ${{ matrix.python-version }}
5454
os: ${{ matrix.os }}

.github/workflows/pytest-vctl.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
# Each entry in the os and python-version matrix will be run so for the 3 x 4 there will be 12 jobs run
40-
os: [ ubuntu-20.04 ]
41-
python-version: [ 3.8 ]
40+
os: [ ubuntu-22.04 ]
41+
python-version: [ '3.10' ]
4242

4343
# Run-on determines the operating system available to run on
4444
# - At the current time there is only ubuntu machines between 16.04 and 20.04 available
@@ -59,7 +59,7 @@ jobs:
5959

6060
# Run the specified tests and save the results to a unique file that can be archived for later analysis.
6161
- name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
62-
uses: volttron/volttron-build-action@v6
62+
uses: volttron/volttron-build-action@no_rmq
6363
with:
6464
python_version: ${{ matrix.python-version }}
6565
os: ${{ matrix.os }}

0 commit comments

Comments
 (0)