Changes to github workflow and volttrontesting based on last successf…

…ul github action PR
VOLTTRON · Nov 10, 2023 · 1159b33 · 1159b33
1 parent ce5ff49
commit 1159b33
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 59 deletions.
diff --git a/.github/workflows/code_analysis.yml b/.github/workflows/code_analysis.yml
@@ -20,10 +20,6 @@ on:
   schedule:
     - cron: '25 18 * * 2'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   analyze:
     name: Analyze

diff --git a/.github/workflows/pytest-auth.yml b/.github/workflows/pytest-auth.yml
@@ -26,10 +26,6 @@ on:
       - develop
       - releases/**
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   # The job named build
   build:
@@ -60,7 +56,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}

diff --git a/.github/workflows/pytest-dbutils-backup_db.yml b/.github/workflows/pytest-dbutils-backup_db.yml
@@ -26,10 +26,6 @@ on:
       - develop
       - releases/**
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   build:
     env:
@@ -65,7 +61,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         timeout-minutes: 600
         with:
             python_version: ${{ matrix.python-version }}

diff --git a/.github/workflows/pytest-dbutils-influxdbfuncts.yml b/.github/workflows/pytest-dbutils-influxdbfuncts.yml
@@ -17,9 +17,6 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
 
 jobs:
   build:
@@ -54,7 +51,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         timeout-minutes: 600
         with:
             python_version: ${{ matrix.python-version }}

diff --git a/.github/workflows/pytest-dbutils-mysqlfuncts.yml b/.github/workflows/pytest-dbutils-mysqlfuncts.yml
@@ -17,9 +17,6 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
 
 jobs:
   build:
@@ -54,7 +51,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         timeout-minutes: 600
         with:
             python_version: ${{ matrix.python-version }}

diff --git a/.github/workflows/pytest-dbutils-postgresqlfuncts.yml b/.github/workflows/pytest-dbutils-postgresqlfuncts.yml
@@ -17,9 +17,6 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
 
 jobs:
   build:
@@ -54,7 +51,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         timeout-minutes: 600
         with:
             python_version: ${{ matrix.python-version }}

diff --git a/.github/workflows/pytest-dbutils-sqlitefuncts.yml b/.github/workflows/pytest-dbutils-sqlitefuncts.yml
@@ -17,9 +17,7 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+
 jobs:
   build:
     env:
@@ -54,7 +52,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         timeout-minutes: 600
         with:
             python_version: ${{ matrix.python-version }}

diff --git a/.github/workflows/pytest-dbutils-timescaldbfuncts.yml b/.github/workflows/pytest-dbutils-timescaldbfuncts.yml
@@ -17,9 +17,7 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+
 jobs:
   build:
     env:
@@ -53,7 +51,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         timeout-minutes: 600
         with:
             python_version: ${{ matrix.python-version }}

diff --git a/.github/workflows/pytest-miscellaneous-tests.yml b/.github/workflows/pytest-miscellaneous-tests.yml
@@ -24,9 +24,7 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+
 jobs:
   # The job named build
   build:
@@ -57,39 +55,39 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis
       - name: Run certs test on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
           python_version: ${{ matrix.python-version }}
           os: ${{ matrix.os }}
           test_path: volttrontesting/platform/web/test_certs.py
           test_output_suffix: misc
 
       - name: Run core agent test on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
           python_version: ${{ matrix.python-version }}
           os: ${{ matrix.os }}
           test_path: volttrontesting/platform/test_core_agent.py
           test_output_suffix: misc
 
       - name: Run packaging test on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
           python_version: ${{ matrix.python-version }}
           os: ${{ matrix.os }}
           test_path: volttrontesting/platform/test_packaging.py
           test_output_suffix: misc
 
       - name: Run platform init test on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
           python_version: ${{ matrix.python-version }}
           os: ${{ matrix.os }}
           test_path: volttrontesting/platform/test_platform_init.py
           test_output_suffix: misc
 
       - name: Run sqlite3 test on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
           python_version: ${{ matrix.python-version }}
           os: ${{ matrix.os }}

diff --git a/.github/workflows/pytest-testutils.yml b/.github/workflows/pytest-testutils.yml
@@ -19,9 +19,7 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+
 jobs:
   build:
     # The strategy allows customization of the build and allows matrixing the version of os and software
@@ -48,7 +46,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}

diff --git a/.github/workflows/pytest-vctl.yml b/.github/workflows/pytest-vctl.yml
@@ -25,9 +25,7 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+
 jobs:
   # The job named build
   build:
@@ -59,7 +57,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v6
+        uses: volttron/volttron-build-action@v5
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}

diff --git a/.github/workflows/pytest-web.yml b/.github/workflows/pytest-web.yml
@@ -24,9 +24,7 @@ on:
       - main
       - develop
       - releases/**
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+
 jobs:
   # The job named build
   build:
@@ -57,7 +55,7 @@ jobs:
 
       # Run the specified tests and save the results to a unique file that can be archived for later analysis.
       - name: Run pytest on ${{ matrix.python-version }}, ${{ matrix.os }}
-        uses: volttron/volttron-build-action@v7
+        uses: volttron/volttron-build-action@v5
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}

diff --git a/volttrontesting/fixtures/volttron_platform_fixtures.py b/volttrontesting/fixtures/volttron_platform_fixtures.py
@@ -49,8 +49,10 @@ def build_wrapper(vip_address: str, should_start: bool = True, messagebus: str =
                               auth_enabled=kwargs.pop('auth_enabled', True))
     if should_start:
         wrapper.startup_platform(vip_address=vip_address, **kwargs)
-        if not wrapper.dynamic_agent:
-            raise ValueError(f"Couldn't start platform successfully for {wrapper.messagebus}")
+        if wrapper.messagebus == 'rmq':
+            gevent.sleep(5)
+        else:
+            gevent.sleep(2)
         assert wrapper.is_running()
     return wrapper
 
@@ -133,7 +135,7 @@ def volttron_instance(request, **kwargs):
     """
     address = kwargs.pop("vip_address", get_rand_vip())
     if request.param['messagebus'] == 'rmq':
-        kwargs['timeout'] = 240
+        kwargs['timeout'] = 120
 
     wrapper = build_wrapper(address,
                             messagebus=request.param.get('messagebus', 'zmq'),

diff --git a/volttrontesting/platform/dbutils/test_mysqlfuncts.py b/volttrontesting/platform/dbutils/test_mysqlfuncts.py
@@ -435,7 +435,7 @@ def get_container_func(request):
         create_all_tables(container, historian_version)
 
         mysqlfuncts = get_mysqlfuncts(connection_port)
-        sleep(25)
+        sleep(5)
         # So that sqlfuncts class can check if metadata is in topics table and sets its variables accordingly
         mysqlfuncts.setup_historian_tables()
         yield container, mysqlfuncts, connection_port, historian_version

diff --git a/volttrontesting/utils/build_agent.py b/volttrontesting/utils/build_agent.py
@@ -19,7 +19,7 @@ def build_agent(platform: PlatformWrapper, identity=None, agent_class=None):
 
     os.environ['VOLTTRON_HOME'] = platform.volttron_home
     agent = platform.build_agent(identity, agent_class=agent_class)
-    gevent.sleep(0.1) # switch context for a bit
+    gevent.sleep(0.1)  # switch context for a bit
     os.environ.pop('VOLTTRON_HOME')
     return agent