Changes to github workflow and volttrontesting based successful workflow run

.github/workflows/code_analysis.yml → .github/temp/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

.github/workflows/pytest-dbutils-backup_db.yml → .github/temp/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 }}

.github/workflows/pytest-dbutils-influxdbfuncts.yml → .github/temp/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 }}

.github/workflows/pytest-dbutils-mysqlfuncts.yml → .github/temp/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 }}

.github/workflows/pytest-dbutils-postgresqlfuncts.yml → .github/temp/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 }}

.github/workflows/pytest-dbutils-sqlitefuncts.yml → .github/temp/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 }}

.github/workflows/pytest-dbutils-timescaldbfuncts.yml → .github/temp/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 }}

.github/workflows/pytest-miscellaneous-tests.yml → .github/temp/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 }}

.github/workflows/pytest-testutils.yml → .github/temp/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@test_no_rerun
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}

.github/workflows/pytest-web.yml → .github/temp/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@test_no_rerun
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}

.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,13 +56,16 @@ 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@test_no_rerun
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: volttrontesting/platform/auth_tests
             test_output_suffix: auth
 
+      - name: tmate session
+        uses: mxschmitt/action-tmate@v3
+
       # Archive the results from the pytest to storage.
       - name: Archive test results
         uses: actions/upload-artifact@v3
@@ -75,6 +74,12 @@ jobs:
           name: pytest-report
           path: output/test-auth-${{matrix.os}}-${{ matrix.python-version }}-results.xml
 
+      -   name: Archive vlog
+          uses: actions/upload-artifact@v3
+          if: always()
+          with:
+              name: volttron-log
+              path: pytest_vlog_file
 #       - name: Publish Unit Test Results
 #         uses: EnricoMi/[email protected]
 #         if: always()

.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,13 +57,17 @@ 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@test_no_rerun
+
         with:
             python_version: ${{ matrix.python-version }}
             os: ${{ matrix.os }}
             test_path: volttrontesting/platform/control_tests
             test_output_suffix: control_tests
 
+      -   name: tmate session
+          uses: mxschmitt/action-tmate@v3
+
       # Archive the results from the pytest to storage.
       - name: Archive test results
         uses: actions/upload-artifact@v3

requirements.py

@@ -87,7 +87,7 @@
                               'pytest_asyncio==0.19.0',
                               'pytest_timeout==2.1.0'],
                   'weather': ['Pint==0.19.2'],
-                  'yapf': ['yapf'],
+                  #'yapf': ['yapf'],
                   'web': ['ws4py==0.5.1',
                           'PyJWT==1.7.1',
                           'Jinja2==3.1.2',

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'),

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

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
 

volttrontesting/utils/platformwrapper.py

@@ -728,7 +728,7 @@ def startup_platform(self, vip_address, auth_dict=None,
                          msgdebug=False,
                          setupmode=False,
                          agent_monitor_frequency=600,
-                         timeout=60,
+                         timeout=180,
                          # Allow the AuthFile to be preauthenticated with keys for service agents.
                          perform_preauth_service_agents=True):
 
@@ -944,8 +944,8 @@ def startup_platform(self, vip_address, auth_dict=None,
             # if msgdebug:
             #     cmd.append('--msgdebug')
             if enable_logging:
-                cmd.append('-v')
-            cmd.append('-l{}'.format(self.log_path))
+                cmd.append('-vv')
+            cmd.append('-l {}'.format(self.log_path))
             if setupmode:
                 cmd.append('--setup-mode')
 
@@ -959,8 +959,11 @@ def startup_platform(self, vip_address, auth_dict=None,
             # A None value means that the process is still running.
             # A negative means that the process exited with an error.
             assert self.p_process.poll() is None
-
-            utils.wait_for_volttron_startup(self.volttron_home, timeout)
+            try:
+                utils.wait_for_volttron_startup(self.volttron_home, timeout)
+            except Exception:
+                shutil.copyfile(self.log_path, "pytest_vlog_file")
+                print(os.path.abspath("pytest_vlog_file"))
 
             if self.auth_enabled:
                 self.serverkey = self.keystore.public