Commit da9285d4 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch '131-master-agios-not-found-in-the-ci-pipeline' into 'master' 

Resolve "[master] AGIOS not found in the CI pipeline"

Closes #131

See merge request hpc/gekkofs!70
parents b8385c7f 66a1dcb4

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ compile dependencies: 
   # If the download and compile script have been modified the cache gets invalidated and dependencies will be built again.

   - ( [ -f "${DEPS_COMMIT}" ] && git diff --quiet "`cat ${DEPS_COMMIT}`" -- scripts/dl_dep.sh scripts/compile_dep.sh ) || (

           rm -f ${DEPS_COMMIT} &&

           scripts/dl_dep.sh ${DEPS_SRC_PATH} -n ofi &&

           scripts/compile_dep.sh -n ofi ${DEPS_SRC_PATH} ${DEPS_INSTALL_PATH} &&

           scripts/dl_dep.sh ${DEPS_SRC_PATH} -n ofi -c ci &&

           scripts/compile_dep.sh -n ofi -c ci ${DEPS_SRC_PATH} ${DEPS_INSTALL_PATH} &&

           echo "${CI_COMMIT_SHA}" > "${DEPS_COMMIT}"

     )

  artifacts:

scripts/compile_dep.sh

+15 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ SOURCE="" 
INSTALL=""

DEP_CONFIG=""



VALID_DEP_OPTIONS="mogon2 mogon1 ngio direct all"

VALID_DEP_OPTIONS="mogon2 mogon1 ngio direct all ci"



MOGON1_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi" "mercury" "argobots" "margo" "rocksdb"
@@ -35,6 +35,10 @@ ALL_DEPS=( 
     "syscall_intercept" "date" "agios"

)



CI_DEPS=(

    "ofi" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "agios"

)



usage_short() {

	echo "

usage: compile_dep.sh [-h] [-l] [-n <NAPLUGIN>] [-c <CONFIG>] [-d <DEPENDENCY>] [-j <COMPILE_CORES>]
@@ -62,7 +66,7 @@ optional arguments: 
                defaults to 'all'

    -c <CONFIG>, --config <CONFIG>

                allows additional configurations, e.g., for specific clusters

                supported values: {mogon1, mogon2, ngio, direct, all}

                supported values: {mogon1, mogon2, ngio, direct, all, ci}

                defaults to 'direct'

    -d <DEPENDENCY>, --dependency <DEPENDENCY>

                download a specific dependency and ignore --config setting. If unspecified
@@ -104,6 +108,11 @@ list_dependencies() { 
        echo -n "$d "

    done

    echo

    echo -n "  ci: "

    for d in "${CI_DEPS[@]}"; do

        echo -n "$d "

    done

	echo

}



check_dependency() {
@@ -254,6 +263,10 @@ all) 
  DEP_CONFIG=("${ALL_DEPS[@]}")

  echo "'All' dependencies are compiled"

  ;;

ci)

  DEP_CONFIG=("${CI_DEPS[@]}")

  echo "'CI' dependencies are compiled"

  ;;

direct | *)

  DEP_CONFIG=("${DIRECT_DEPS[@]}")

  echo "'Direct' GekkoFS dependencies are compiled (default)"

scripts/dl_dep.sh

+16 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ NA_LAYER="" 
DEP_CONFIG=""

VERBOSE=false



VALID_DEP_OPTIONS="mogon2 mogon1 ngio direct all"

VALID_DEP_OPTIONS="mogon2 mogon1 ngio direct all ci"



MOGON1_DEPS=(

    "zstd" "lz4" "snappy" "capstone" "ofi-verbs" "mercury" "argobots" "margo" "rocksdb"
@@ -35,6 +35,10 @@ ALL_DEPS=( 
     "syscall_intercept" "date" "agios"

)



CI_DEPS=(

    "ofi" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" "agios"

)



# Stop all backround jobs on interruption.

# "kill -- -$$" sends a SIGTERM to the whole process group,

# thus killing also descendants.
@@ -83,6 +87,11 @@ list_dependencies() { 
        echo -n "$d "

    done

    echo

    echo -n "  ci: "

    for d in "${CI_DEPS[@]}"; do

        echo -n "$d "

    done

	echo

}



check_dependency() {
@@ -191,7 +200,7 @@ optional arguments: 
                                defaults to 'ofi'

        -c <CONFIG>, --config <CONFIG>

                                allows additional configurations, e.g., for specific clusters

                                supported values: {mogon2, mogon1, ngio, direct, all}

                                supported values: {mogon2, mogon1, ngio, direct, all, ci}

                                defaults to 'direct'

        -d <DEPENDENCY>, --dependency <DEPENDENCY>

                                download a specific dependency and ignore --config setting. If unspecified
@@ -285,6 +294,10 @@ all) 
  DEP_CONFIG=("${ALL_DEPS[@]}")

  [[ -z "${DEPENDENCY}" ]] && echo "'All' dependencies are downloaded"

  ;;

ci)

  DEP_CONFIG=("${CI_DEPS[@]}")

  [[ -z "${DEPENDENCY}" ]] && echo "'CI' dependencies are downloaded"

  ;;

direct | *)

  DEP_CONFIG=("${DIRECT_DEPS[@]}")

  [[ -z "${DEPENDENCY}" ]] && echo "'Direct' GekkoFS dependencies are downloaded (default)"