fixup! Merge pull request ornladios#3631 from scottwittenburg/ci-rewo…

…rk-gcc-builds
vicentebolea · Jul 12, 2023 · ff0ec46 · ff0ec46
1 parent 9965921
commit ff0ec46
Show file tree

Hide file tree

Showing 44 changed files with 3 additions and 65 deletions.
diff --git a/scripts/ci/cmake-v2/ci-common.cmake b/scripts/ci/cmake-v2/ci-common.cmake
diff --git a/scripts/ci/cmake-v2/ci-ascent-common.cmake → scripts/ci/cmake/ci-ascent-common.cmake b/scripts/ci/cmake-v2/ci-ascent-common.cmake → scripts/ci/cmake/ci-ascent-common.cmake
diff --git a/scripts/ci/cmake-v2/ci-ascent-cuda.cmake → scripts/ci/cmake/ci-ascent-cuda.cmake b/scripts/ci/cmake-v2/ci-ascent-cuda.cmake → scripts/ci/cmake/ci-ascent-cuda.cmake
diff --git a/...s/ci/cmake-v2/ci-ascent-kokkos-cuda.cmake → scripts/ci/cmake/ci-ascent-kokkos-cuda.cmake b/...s/ci/cmake-v2/ci-ascent-kokkos-cuda.cmake → scripts/ci/cmake/ci-ascent-kokkos-cuda.cmake
diff --git a/scripts/ci/cmake-v2/ci-ascent-nvhpc.cmake → scripts/ci/cmake/ci-ascent-nvhpc.cmake b/scripts/ci/cmake-v2/ci-ascent-nvhpc.cmake → scripts/ci/cmake/ci-ascent-nvhpc.cmake
diff --git a/scripts/ci/cmake-v2/ci-ascent-xl.cmake → scripts/ci/cmake/ci-ascent-xl.cmake b/scripts/ci/cmake-v2/ci-ascent-xl.cmake → scripts/ci/cmake/ci-ascent-xl.cmake
diff --git a/scripts/ci/cmake/ci-common.cmake b/scripts/ci/cmake/ci-common.cmake
@@ -15,7 +15,7 @@ if(NOT CTEST_BUILD_FLAGS)
   if(CTEST_CMAKE_GENERATOR STREQUAL "Unix Makefiles")
     set(CTEST_BUILD_FLAGS "-k -j${N2CPUS}")
   elseif(CTEST_CMAKE_GENERATOR STREQUAL "Ninja")
-    set(CTEST_BUILD_FLAGS "-k0 -j${N2CPUS}")
+    set(CTEST_BUILD_FLAGS "-j${N2CPUS}")
   endif()
 endif()
 if(NOT PARALLEL_LEVEL IN_LIST CTEST_TEST_ARGS)

diff --git a/scripts/ci/cmake-v2/ci-crusher-cray.cmake → scripts/ci/cmake/ci-crusher-cray.cmake b/scripts/ci/cmake-v2/ci-crusher-cray.cmake → scripts/ci/cmake/ci-crusher-cray.cmake
diff --git a/...s/ci/cmake-v2/ci-crusher-kokkos-hip.cmake → scripts/ci/cmake/ci-crusher-kokkos-hip.cmake b/...s/ci/cmake-v2/ci-crusher-kokkos-hip.cmake → scripts/ci/cmake/ci-crusher-kokkos-hip.cmake
diff --git a/scripts/ci/cmake-v2/ci-el8-icc-ompi.cmake → scripts/ci/cmake/ci-el8-icc-ompi.cmake b/scripts/ci/cmake-v2/ci-el8-icc-ompi.cmake → scripts/ci/cmake/ci-el8-icc-ompi.cmake
diff --git a/scripts/ci/cmake-v2/ci-el8-icc-serial.cmake → scripts/ci/cmake/ci-el8-icc-serial.cmake b/scripts/ci/cmake-v2/ci-el8-icc-serial.cmake → scripts/ci/cmake/ci-el8-icc-serial.cmake
diff --git a/scripts/ci/cmake-v2/ci-el8-oneapi-ompi.cmake → scripts/ci/cmake/ci-el8-oneapi-ompi.cmake b/scripts/ci/cmake-v2/ci-el8-oneapi-ompi.cmake → scripts/ci/cmake/ci-el8-oneapi-ompi.cmake
diff --git a/...ts/ci/cmake-v2/ci-el8-oneapi-serial.cmake → scripts/ci/cmake/ci-el8-oneapi-serial.cmake b/...ts/ci/cmake-v2/ci-el8-oneapi-serial.cmake → scripts/ci/cmake/ci-el8-oneapi-serial.cmake
diff --git a/...make-v2/ci-macos11-xcode13_0-serial.cmake → ...i/cmake/ci-macos11-xcode13_0-serial.cmake b/...make-v2/ci-macos11-xcode13_0-serial.cmake → ...i/cmake/ci-macos11-xcode13_0-serial.cmake
diff --git a/...ke-v2/ci-macos12-xcode13_4_1-serial.cmake → ...cmake/ci-macos12-xcode13_4_1-serial.cmake b/...ke-v2/ci-macos12-xcode13_4_1-serial.cmake → ...cmake/ci-macos12-xcode13_4_1-serial.cmake
diff --git a/...make-v2/ci-ubuntu20.04-clang10-ompi.cmake → ...i/cmake/ci-ubuntu20.04-clang10-ompi.cmake b/...make-v2/ci-ubuntu20.04-clang10-ompi.cmake → ...i/cmake/ci-ubuntu20.04-clang10-ompi.cmake
diff --git a/...ke-v2/ci-ubuntu20.04-clang10-serial.cmake → ...cmake/ci-ubuntu20.04-clang10-serial.cmake b/...ke-v2/ci-ubuntu20.04-clang10-serial.cmake → ...cmake/ci-ubuntu20.04-clang10-serial.cmake
diff --git a/...cmake-v2/ci-ubuntu20.04-clang6-ompi.cmake → ...ci/cmake/ci-ubuntu20.04-clang6-ompi.cmake b/...cmake-v2/ci-ubuntu20.04-clang6-ompi.cmake → ...ci/cmake/ci-ubuntu20.04-clang6-ompi.cmake
diff --git a/...ake-v2/ci-ubuntu20.04-clang6-serial.cmake → .../cmake/ci-ubuntu20.04-clang6-serial.cmake b/...ake-v2/ci-ubuntu20.04-clang6-serial.cmake → .../cmake/ci-ubuntu20.04-clang6-serial.cmake
diff --git a/...cmake-v2/ci-ubuntu20.04-gcc10-mpich.cmake → ...ci/cmake/ci-ubuntu20.04-gcc10-mpich.cmake b/...cmake-v2/ci-ubuntu20.04-gcc10-mpich.cmake → ...ci/cmake/ci-ubuntu20.04-gcc10-mpich.cmake
diff --git a/.../cmake-v2/ci-ubuntu20.04-gcc10-ompi.cmake → .../ci/cmake/ci-ubuntu20.04-gcc10-ompi.cmake b/.../cmake-v2/ci-ubuntu20.04-gcc10-ompi.cmake → .../ci/cmake/ci-ubuntu20.04-gcc10-ompi.cmake
diff --git a/...make-v2/ci-ubuntu20.04-gcc10-serial.cmake → ...i/cmake/ci-ubuntu20.04-gcc10-serial.cmake b/...make-v2/ci-ubuntu20.04-gcc10-serial.cmake → ...i/cmake/ci-ubuntu20.04-gcc10-serial.cmake
diff --git a/.../cmake-v2/ci-ubuntu20.04-gcc11-ompi.cmake → .../ci/cmake/ci-ubuntu20.04-gcc11-ompi.cmake b/.../cmake-v2/ci-ubuntu20.04-gcc11-ompi.cmake → .../ci/cmake/ci-ubuntu20.04-gcc11-ompi.cmake
diff --git a/...make-v2/ci-ubuntu20.04-gcc11-serial.cmake → ...i/cmake/ci-ubuntu20.04-gcc11-serial.cmake b/...make-v2/ci-ubuntu20.04-gcc11-serial.cmake → ...i/cmake/ci-ubuntu20.04-gcc11-serial.cmake
diff --git a/...i/cmake-v2/ci-ubuntu20.04-gcc8-ompi.cmake → ...s/ci/cmake/ci-ubuntu20.04-gcc8-ompi.cmake b/...i/cmake-v2/ci-ubuntu20.04-gcc8-ompi.cmake → ...s/ci/cmake/ci-ubuntu20.04-gcc8-ompi.cmake
diff --git a/...cmake-v2/ci-ubuntu20.04-gcc8-serial.cmake → ...ci/cmake/ci-ubuntu20.04-gcc8-serial.cmake b/...cmake-v2/ci-ubuntu20.04-gcc8-serial.cmake → ...ci/cmake/ci-ubuntu20.04-gcc8-serial.cmake
diff --git a/...i/cmake-v2/ci-ubuntu20.04-gcc9-ompi.cmake → ...s/ci/cmake/ci-ubuntu20.04-gcc9-ompi.cmake b/...i/cmake-v2/ci-ubuntu20.04-gcc9-ompi.cmake → ...s/ci/cmake/ci-ubuntu20.04-gcc9-ompi.cmake
diff --git a/...cmake-v2/ci-ubuntu20.04-gcc9-serial.cmake → ...ci/cmake/ci-ubuntu20.04-gcc9-serial.cmake b/...cmake-v2/ci-ubuntu20.04-gcc9-serial.cmake → ...ci/cmake/ci-ubuntu20.04-gcc9-serial.cmake
diff --git a/.../ci/cmake-v2/ci-win2019-vs2019-ompi.cmake → ...pts/ci/cmake/ci-win2019-vs2019-ompi.cmake b/.../ci/cmake-v2/ci-win2019-vs2019-ompi.cmake → ...pts/ci/cmake/ci-win2019-vs2019-ompi.cmake
diff --git a/...i/cmake-v2/ci-win2019-vs2019-serial.cmake → ...s/ci/cmake/ci-win2019-vs2019-serial.cmake b/...i/cmake-v2/ci-win2019-vs2019-serial.cmake → ...s/ci/cmake/ci-win2019-vs2019-serial.cmake
diff --git a/.../ci/cmake-v2/ci-win2022-vs2022-ompi.cmake → ...pts/ci/cmake/ci-win2022-vs2022-ompi.cmake b/.../ci/cmake-v2/ci-win2022-vs2022-ompi.cmake → ...pts/ci/cmake/ci-win2022-vs2022-ompi.cmake
diff --git a/...i/cmake-v2/ci-win2022-vs2022-serial.cmake → ...s/ci/cmake/ci-win2022-vs2022-serial.cmake b/...i/cmake-v2/ci-win2022-vs2022-serial.cmake → ...s/ci/cmake/ci-win2022-vs2022-serial.cmake
diff --git a/scripts/ci/gh-actions/run.sh b/scripts/ci/gh-actions/run.sh
@@ -39,7 +39,7 @@ fi
 export CI_BIN_DIR="${CI_ROOT_DIR}/${GH_YML_JOBNAME}"
 
 STEP=$1
-CTEST_SCRIPT=gha/scripts/ci/cmake-v2/ci-${GH_YML_JOBNAME}.cmake
+CTEST_SCRIPT=gha/scripts/ci/cmake/ci-${GH_YML_JOBNAME}.cmake
 
 # Update and Test steps enable an extra step
 CTEST_STEP_ARGS="-Ddashboard_do_${STEP}=ON"

diff --git a/scripts/ci/gitlab-ci/run.sh b/scripts/ci/gitlab-ci/run.sh
@@ -4,7 +4,7 @@ set -e
 
 source scripts/ci/gitlab-ci/setup-vars.sh
 
-readonly CTEST_SCRIPT=scripts/ci/cmake-v2/ci-${CI_JOB_NAME}.cmake
+readonly CTEST_SCRIPT=scripts/ci/cmake/ci-${CI_JOB_NAME}.cmake
 if [ ! -f "$CTEST_SCRIPT" ]
 then
   echo "[E] Variable files does not exits: $CTEST_SCRIPT"

diff --git a/scripts/ci/images-v2/Dockerfile.ci-el8-intel → scripts/ci/images/Dockerfile.ci-el8-intel b/scripts/ci/images-v2/Dockerfile.ci-el8-intel → scripts/ci/images/Dockerfile.ci-el8-intel
diff --git a/...s-v2/Dockerfile.ci-spack-ubuntu20.04-base → ...ages/Dockerfile.ci-spack-ubuntu20.04-base b/...s-v2/Dockerfile.ci-spack-ubuntu20.04-base → ...ages/Dockerfile.ci-spack-ubuntu20.04-base
diff --git a/...-v2/Dockerfile.ci-spack-ubuntu20.04-clang → ...ges/Dockerfile.ci-spack-ubuntu20.04-clang b/...-v2/Dockerfile.ci-spack-ubuntu20.04-clang → ...ges/Dockerfile.ci-spack-ubuntu20.04-clang
diff --git a/...es-v2/Dockerfile.ci-spack-ubuntu20.04-gcc → ...mages/Dockerfile.ci-spack-ubuntu20.04-gcc b/...es-v2/Dockerfile.ci-spack-ubuntu20.04-gcc → ...mages/Dockerfile.ci-spack-ubuntu20.04-gcc
diff --git a/...-v2/Dockerfile.ci-spack-ubuntu20.04-intel → ...ges/Dockerfile.ci-spack-ubuntu20.04-intel b/...-v2/Dockerfile.ci-spack-ubuntu20.04-intel → ...ges/Dockerfile.ci-spack-ubuntu20.04-intel
diff --git a/scripts/ci/images-v2/build-el8.sh → scripts/ci/images/build-el8.sh b/scripts/ci/images-v2/build-el8.sh → scripts/ci/images/build-el8.sh
diff --git a/scripts/ci/images-v2/build-ubuntu.sh → scripts/ci/images/build-ubuntu.sh b/scripts/ci/images-v2/build-ubuntu.sh → scripts/ci/images/build-ubuntu.sh
diff --git a/scripts/ci/images-v2/oneAPI.repo → scripts/ci/images/oneAPI.repo b/scripts/ci/images-v2/oneAPI.repo → scripts/ci/images/oneAPI.repo
diff --git a/scripts/ci/images-v2/packages.yaml → scripts/ci/images/packages.yaml b/scripts/ci/images-v2/packages.yaml → scripts/ci/images/packages.yaml
diff --git a/scripts/ci/images-v2/specs.yaml → scripts/ci/images/specs.yaml b/scripts/ci/images-v2/specs.yaml → scripts/ci/images/specs.yaml