From aff4586ab2627b673d4fa212a61024cf34771f57 Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Thu, 7 Sep 2023 11:02:19 -0600
Subject: [PATCH] test: dockerfile updates for golang-focal for cmake

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 src/test/docker/focal-golang/Dockerfile | 21 ++++++++++++++-------
 src/test/generate-matrix.py             |  7 -------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/test/docker/focal-golang/Dockerfile b/src/test/docker/focal-golang/Dockerfile
index d1d1bcc72..9c0340a28 100644
--- a/src/test/docker/focal-golang/Dockerfile
+++ b/src/test/docker/focal-golang/Dockerfile
@@ -6,13 +6,20 @@ ARG UID=1000
 # Install extra buildrequires for flux-sched:
 RUN sudo apt-get update
 RUN sudo apt-get -qq install -y --no-install-recommends \
-	libboost-graph-dev \
-	libboost-system-dev \
-	libboost-filesystem-dev \
-	libboost-regex-dev \
-	python-yaml \
-	libyaml-cpp-dev \
-	libedit-dev
+    libboost-graph-dev \
+    libboost-system-dev \
+    libboost-filesystem-dev \
+    libboost-regex-dev \
+    python-yaml \
+    libyaml-cpp-dev \
+    ninja-build \
+    curl \
+    libedit-dev
+
+# Install cmake for new build system
+RUN curl -s -L https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-$(uname -m).sh > cmake.sh ;\
+  sudo bash cmake.sh --prefix=/usr/local --skip-license ;\
+  rm cmake.sh
 
 # Install Golang 1.19.10 for binding tests
 RUN wget https://go.dev/dl/go1.19.10.linux-amd64.tar.gz
diff --git a/src/test/generate-matrix.py b/src/test/generate-matrix.py
index 54cb0d5d6..3b6131de8 100755
--- a/src/test/generate-matrix.py
+++ b/src/test/generate-matrix.py
@@ -196,13 +196,6 @@ def __str__(self):
     ),
 )
 
-# RHEL7 clone
-matrix.add_build(
-    name="el7",
-    image="el7",
-    docker_tag=True,
-)
-
 # RHEL8 clone
 matrix.add_build(
     name="el8",