From 326b64d9f2d7f0625c86232883ca15dbafb2d18e Mon Sep 17 00:00:00 2001
From: Simon Pintarelli <simon.pintarelli@cscs.ch>
Date: Sat, 17 Aug 2024 10:56:41 +0200
Subject: [PATCH] update

---
 ci/cscs.yml                         | 13 +++++++++++--
 ci/slurm_docker/Dockerfile          |  5 ++++-
 ci/slurm_docker/install_and_test.sh | 12 ------------
 3 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100755 ci/slurm_docker/install_and_test.sh

diff --git a/ci/cscs.yml b/ci/cscs.yml
index b942d24..6fb0aff 100644
--- a/ci/cscs.yml
+++ b/ci/cscs.yml
@@ -3,7 +3,7 @@ include:
 
 stages:
   - baseimage
-  - buildtest
+  - build
 
 .my-dynamic-image-name:
   extends: [.dynamic-image-name]
@@ -26,10 +26,19 @@ build slurm base:
 build:
   extends: [.container-builder-cscs-zen2]
   needs: ["build slurm base"]
-  stage: buildtest
+  stage: build
   variables:
     CSCS_REBUILD_POLICY: always
     CSCS_NOTIFICATION_CONTEXT: "$slurm_version"
     DOCKERFILE: ci/slurm_docker/Dockerfile
     DOCKER_BUILD_ARGS: '["BASE_IMAGE=${BASE_IMAGE}"]'
     PERSIST_IMAGE_NAME: $CSCS_REGISTRY_PATH/base/public/slurm-uenv-mount
+
+
+# # initialization
+# /entrypoint.sh
+# sinfo
+# echo "Run tests in bash-bats"
+# su testuser -c bash <<\EOF
+# bats ci/tests
+# EOF
diff --git a/ci/slurm_docker/Dockerfile b/ci/slurm_docker/Dockerfile
index 78c4146..513dcbd 100644
--- a/ci/slurm_docker/Dockerfile
+++ b/ci/slurm_docker/Dockerfile
@@ -3,4 +3,7 @@ FROM $BASE_IMAGE
 
 COPY . /src
 WORKDIR /src
-RUN ./ci/slurm_docker/install_and_test.sh
+
+RUN CXX=g++-12 CC=gcc-12 meson setup builddir \
+    && meson install -C builddir \
+    && echo "required /usr/local/lib64/libslurm-uenv-mount.so" > /etc/slurm/plugstack.conf
diff --git a/ci/slurm_docker/install_and_test.sh b/ci/slurm_docker/install_and_test.sh
deleted file mode 100755
index aa4d96b..0000000
--- a/ci/slurm_docker/install_and_test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/bash
-
-CXX=g++-12 CC=gcc-12 meson setup builddir
-meson install -C builddir
-echo "required /usr/local/lib64/libslurm-uenv-mount.so" > /etc/slurm/plugstack.conf
-# initialization
-/entrypoint.sh
-sinfo
-echo "Run tests in bash-bats"
-su testuser -c bash <<\EOF
-bats ci/tests
-EOF