From e3528e7b57f0581f84f6223add982d6cad3e005c Mon Sep 17 00:00:00 2001 From: William Hobbs Date: Mon, 29 Jan 2024 13:30:25 -0800 Subject: [PATCH] gitlab: install flux-core Problem: We create an install directory, but seem to miss actually installing flux-core. Install flux-core so future projects can build with it. Utilize the installation, rather than the build, in MPI testing. --- .gitlab-ci.yml | 2 +- .gitlab/builds.gitlab-ci.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4944175..2e69af2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ default: script: - export MPI_TESTS_DIRECTORY=$(pwd)/mpi - export FTC_DIRECTORY=$(pwd) - - flux run -N2 $CORE_BUILD_DIR/src/cmd/flux start $MPI_TESTS_DIRECTORY/outer_script.sh + - flux run -N2 $CORE_INSTALL_PREFIX/bin/flux start $MPI_TESTS_DIRECTORY/outer_script.sh corona-core-build: extends: diff --git a/.gitlab/builds.gitlab-ci.yml b/.gitlab/builds.gitlab-ci.yml index 911297d..f9c140a 100644 --- a/.gitlab/builds.gitlab-ci.yml +++ b/.gitlab/builds.gitlab-ci.yml @@ -27,6 +27,7 @@ - ../configure --prefix=${CI_DIRECTORY}/flux-core/install - make -j $(nproc) ## need to install to get pkgconfig files + - make -j $(nproc) install - export CORE_BUILD_DIR=$(pwd) - export CORE_INSTALL_PREFIX=${CI_DIRECTORY}/flux-core/install - cd $FTC_DIRECTORY