From 03bd470dbb162d34482673bc6e941c238f39fef4 Mon Sep 17 00:00:00 2001
From: Johanna England <johanna.england@sikt.no>
Date: Fri, 28 Jul 2023 16:05:47 +0200
Subject: [PATCH 1/2] Pin pip version to 23.1.0 for tests

Upgrades of pip and pip-compile broke the CI pipeline
More info can be found here: https://github.com/mitsuhiko/rye/issues/368
---
 .github/workflows/build-and-test.yml | 2 +-
 tox.ini                              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index c3e9312fcb..7128ef4829 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -51,7 +51,7 @@ jobs:
       - name: "Install test runner dependencies"
         run: |
           set -xe
-          python -m pip install --upgrade pip setuptools wheel 'tox<4' tox-gh-actions coverage virtualenv snmpsim 'pyasn1<0.5.0'
+          python -m pip install --upgrade 'pip==23.1.0' setuptools wheel 'tox<4' tox-gh-actions coverage virtualenv snmpsim 'pyasn1<0.5.0'
           sudo apt-get install -y nbtscan
 
       # virtualenv seems to currently be embedding a broken version of
diff --git a/tox.ini b/tox.ini
index 81db28242f..eb3c4f6584 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,6 +30,7 @@ setenv =
     LC_ALL=C.UTF-8
     LANG=C.UTF-8
     PYTHONPATH = {toxinidir}/tests
+    VIRTUALENV_PIP=23.1.0
     BUILDDIR = {envdir}
     CHROME_BIN = /usr/bin/google-chrome
     DJANGO_SETTINGS_MODULE = nav.django.settings
@@ -91,6 +92,7 @@ setenv =
        PYLINTHOME = {toxinidir}
        LC_ALL=C.UTF-8
        LANG=C.UTF-8
+       VIRTUALENV_PIP=23.1.0
 commands_pre =
          pip-compile --resolver=backtracking --output-file {envdir}/requirements.txt tests/requirements.txt requirements/base.txt requirements/django32.txt
          pip-sync {envdir}/requirements.txt
@@ -105,6 +107,7 @@ setenv =
     DJANGO_SETTINGS_MODULE = nav.django.settings
     LC_ALL=C.UTF-8
     LANG=C.UTF-8
+    VIRTUALENV_PIP=23.1.0
 allowlist_externals = sh
 commands_pre =
          pip-compile --resolver=backtracking --output-file {envdir}/requirements.txt doc/requirements.txt

From d2620e7f1c59d4565ced145bd8cc1d2de096ad22 Mon Sep 17 00:00:00 2001
From: Morten Brekkevold <morten.brekkevold@sikt.no>
Date: Fri, 4 Aug 2023 14:45:29 +0200
Subject: [PATCH 2/2] Use specific chromedriver version

We're having troubles with the setup-chromedriver action failing on
downloading the latest Chromedriver.  This version locks the action
itself, and also version locks the chromedriver.

See nanasess/setup-chromedriver#200 for details.
---
 .github/workflows/build-and-test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 7128ef4829..d6f2290fbc 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -68,7 +68,9 @@ jobs:
 
       - uses: browser-actions/setup-chrome@latest
       - run: chrome --version
-      - uses: nanasess/setup-chromedriver@master
+      - uses: nanasess/setup-chromedriver@v2
+        with:
+          chromedriver-version: '115.0.5790.170'  # https://github.com/nanasess/setup-chromedriver/issues/200
 
       - name: "Set up PostgreSQL"
         uses: harmon758/postgresql-action@v1