From d305eb572a9ea86d9e4a0a5102a3b459dd75f6c2 Mon Sep 17 00:00:00 2001
From: George Bisbas <g.bisbas18@imperial.ac.uk>
Date: Wed, 5 Jul 2023 22:41:00 +0100
Subject: [PATCH] ci: Fix test names

---
 .github/workflows/docker-bases.yml      |  4 ++--
 .github/workflows/pytest-core-nompi.yml | 18 +++++++++---------
 docker/Dockerfile.cpu                   |  2 +-
 docker/Dockerfile.nvidia                |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-bases.yml b/.github/workflows/docker-bases.yml
index 65a12fb289a..f51f36470ba 100644
--- a/.github/workflows/docker-bases.yml
+++ b/.github/workflows/docker-bases.yml
@@ -27,13 +27,13 @@ jobs:
         include:
           - tag: 'devitocodes/bases:nvidia-nvc'
             arch: 'arch=nvc'
-            version: 'ver=nvhpc-22-7'
+            version: 'ver=nvhpc-23-3'
             dockerfile: './docker/Dockerfile.nvidia'
             runner: ["self-hosted", "nvidiagpu"]
 
           - tag: 'devitocodes/bases:nvidia-nvcc'
             arch: 'arch=nvcc'
-            version: 'ver=nvhpc-22-7'
+            version: 'ver=nvhpc-23-3'
             dockerfile: './docker/Dockerfile.nvidia'
             runner: ["self-hosted", "nvidiagpu"]
 
diff --git a/.github/workflows/pytest-core-nompi.yml b/.github/workflows/pytest-core-nompi.yml
index 0f53c5c021b..acff4799f4c 100644
--- a/.github/workflows/pytest-core-nompi.yml
+++ b/.github/workflows/pytest-core-nompi.yml
@@ -37,9 +37,9 @@ jobs:
            pytest-ubuntu-py310-gcc10-noomp,
            pytest-ubuntu-py311-gcc12-omp,
            pytest-osx-py38-clang-omp,
-           pytest-docker-py38-gcc-omp,
-           pytest-docker-py38-icc-omp,
-           pytest-docker-py38-icx-omp
+           pytest-docker-py39-gcc-omp,
+           pytest-docker-py39-icc-omp,
+           pytest-docker-py39-icx-omp
         ]
         set: [base, adjoint]
         include:
@@ -92,22 +92,22 @@ jobs:
           language: "C"
           sympy: "1.9"
 
-        - name: pytest-docker-py38-gcc-omp
-          python-version: '3.8'
+        - name: pytest-docker-py39-gcc-omp
+          python-version: '3.9'
           os: ubuntu-latest
           arch: "gcc"
           language: "openmp"
           sympy: "1.10"
 
-        - name: pytest-docker-py38-icc-omp
-          python-version: '3.8'
+        - name: pytest-docker-py39-icc-omp
+          python-version: '3.9'
           os: ubuntu-22.04
           arch: "icc"
           language: "openmp"
           sympy: "1.11"
 
-        - name: pytest-docker-py38-icx-omp
-          python-version: '3.8'
+        - name: pytest-docker-py39-icx-omp
+          python-version: '3.9'
           os: ubuntu-22.04
           arch: "icx"
           language: "openmp"
diff --git a/docker/Dockerfile.cpu b/docker/Dockerfile.cpu
index 9a8d00bf2ff..d6e4ee26af6 100644
--- a/docker/Dockerfile.cpu
+++ b/docker/Dockerfile.cpu
@@ -2,7 +2,7 @@
 # This Dockerfile contains the Devito codes and can be built using different base images.
 ##############################################################
 
-ARG pyversion=python:3.9
+ARG pyversion=python:3.8
 ARG arch=gcc
 
 # Base image 
diff --git a/docker/Dockerfile.nvidia b/docker/Dockerfile.nvidia
index a8811d55199..8340497d616 100644
--- a/docker/Dockerfile.nvidia
+++ b/docker/Dockerfile.nvidia
@@ -2,7 +2,7 @@
 # This Dockerfile contains the NVidia HPC SDK (nvc, cuda, OpenMPI) for Devito
 ##############################################################
 ARG ver
-ARG pyversion=python:3.9
+ARG pyversion=python:3.8
 ARG arch="nvc"
 
 ########################################################################