From ba2dc0d293ce794cced8c8da30892a0226439973 Mon Sep 17 00:00:00 2001 From: Josh Hernandez Date: Fri, 25 Apr 2025 13:13:31 -0400 Subject: [PATCH 1/3] Update Ubuntu to latest build version --- .../workflows/nightly_core_functionality_tests.yml | 8 ++++---- .github/workflows/production_smoke_tests.yml | 8 ++++---- .github/workflows/two_minute_drill.yml | 8 ++++---- .github/workflows/weekly_regression_tests.yml | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/nightly_core_functionality_tests.yml b/.github/workflows/nightly_core_functionality_tests.yml index 2f505d9b..262a1fde 100644 --- a/.github/workflows/nightly_core_functionality_tests.yml +++ b/.github/workflows/nightly_core_functionality_tests.yml @@ -43,9 +43,9 @@ env: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest if: "!contains(github.event.head_commit.message, 'skip ci')" strategy: matrix: @@ -73,9 +73,9 @@ jobs: core_functionality_test: name: Core Functionality tests (${{ matrix.browser }}) needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest strategy: fail-fast: false max-parallel: 1 # run in series diff --git a/.github/workflows/production_smoke_tests.yml b/.github/workflows/production_smoke_tests.yml index b965f773..2eac3652 100644 --- a/.github/workflows/production_smoke_tests.yml +++ b/.github/workflows/production_smoke_tests.yml @@ -39,9 +39,9 @@ env: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest if: "!contains(github.event.head_commit.message, 'skip ci')" strategy: matrix: @@ -69,9 +69,9 @@ jobs: smoke_test: name: Prod smoke tests (${{ matrix.browser }}) needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest strategy: fail-fast: false max-parallel: 1 # run in series diff --git a/.github/workflows/two_minute_drill.yml b/.github/workflows/two_minute_drill.yml index a75c465e..8e4ad7eb 100644 --- a/.github/workflows/two_minute_drill.yml +++ b/.github/workflows/two_minute_drill.yml @@ -52,9 +52,9 @@ env: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest if: "!contains(github.event.head_commit.message, 'skip ci')" strategy: matrix: @@ -82,9 +82,9 @@ jobs: two_minute_drill_tests: name: Two Minute Drill Tests (${{ github.event.inputs.browser }}) needs: [build] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest strategy: fail-fast: false max-parallel: 1 # run in series diff --git a/.github/workflows/weekly_regression_tests.yml b/.github/workflows/weekly_regression_tests.yml index b9095c3d..b87e0195 100644 --- a/.github/workflows/weekly_regression_tests.yml +++ b/.github/workflows/weekly_regression_tests.yml @@ -84,9 +84,9 @@ env: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest if: "!contains(github.event.head_commit.message, 'skip ci')" strategy: matrix: @@ -116,7 +116,7 @@ jobs: # will be used since the scheduler does not have inputs. set_variables: name: Set the Domain, Service, and Browser for Regression Tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest outputs: domain: ${{ github.event.inputs.domain || env.DEFAULT_DOMAIN }} service: ${{ github.event.inputs.service || env.DEFAULT_SERVICE }} @@ -130,7 +130,7 @@ jobs: set_matrix: name: Set Matrix of Browser Values needs: [set_variables] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest outputs: matrix: ${{ steps.set_browser_2.outputs.matrix }} steps: @@ -147,9 +147,9 @@ jobs: regression_test: name: Regression tests (${{ matrix.browser }}) needs: [build, set_variables, set_matrix] - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest env: - GHA_DISTRO: ubuntu-20.04 + GHA_DISTRO: ubuntu-latest strategy: fail-fast: false max-parallel: 1 # run in series From b7210a80061f2319ab5919d8a8fd4dc185855137 Mon Sep 17 00:00:00 2001 From: Josh Hernandez Date: Fri, 25 Apr 2025 13:42:13 -0400 Subject: [PATCH 2/3] Update Desired Capabilities to fix local browser issues --- utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils.py b/utils.py index c26a872f..dd27074f 100644 --- a/utils.py +++ b/utils.py @@ -4,7 +4,6 @@ from selenium import webdriver import settings -from settings import DESIRED_CAP def launch_driver(driver_name=settings.DRIVER, desired_capabilities=None): @@ -94,7 +93,7 @@ def launch_driver(driver_name=settings.DRIVER, desired_capabilities=None): chrome_options.add_argument(f'user-agent={custom_user_agent}') # Make a copy of desired capabilities for Chrome - desired_capabilities = DESIRED_CAP.copy() + desired_capabilities = settings.DESIRED_CAP.copy() # Attach Chrome options desired_capabilities['goog:chromeOptions'] = { From 9b275cf4a15b3199b552b455567e59b9797053d1 Mon Sep 17 00:00:00 2001 From: Josh Hernandez Date: Fri, 25 Apr 2025 13:43:04 -0400 Subject: [PATCH 3/3] Update environs dependency --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0b4e9123..37833826 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ autopep8==1.3.3 requests>=2.20.0 urllib3<2 pythosf==0.0.9 -environs==3.0.0 +environs==14.1.1 faker==0.9.0 pre-commit==2.14.0 ipdb==0.13.13