Commit a1687783 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'proj_restracture' into 'master' 

Project restracture

See merge request zdvresearch_bsc/adafs!135
parents 4ce89644 19ba008d

.gitignore

+3 −3
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ playground 
# python stuff

*.pyc



ifs/\.hidden_playground/

.hidden_playground/



ifs_test/build/

test/build/



ifs/build/
 
build/

.gitlab-ci.yml

+9 −9
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ variables: 
  DEPS_SRC_PATH:     "${CI_PROJECT_DIR}/deps/src"

  DEPS_INSTALL_PATH: "${CI_PROJECT_DIR}/deps/build"

  DEPS_COMMIT:       "${CI_PROJECT_DIR}/deps/build/gks_deps_commit"

  BUILD_PATH:        "${CI_PROJECT_DIR}/ifs/build"

  TESTS_BUILD_PATH:  "${CI_PROJECT_DIR}/ifs_test/build"

  BUILD_PATH:        "${CI_PROJECT_DIR}/build"

  TESTS_BUILD_PATH:  "${CI_PROJECT_DIR}/test/build"

  LOG_PATH:          "${CI_PROJECT_DIR}/logs"

  # Configuration variables

  ADAFS_LOG_LEVEL:   "100"
@@ -27,10 +27,10 @@ compile dependencies: 
  script:

   # Folder of built dependencies is cached and marked with the ID of the commit from which have been built.

   # 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}`" -- ifs/scripts/dl_dep.sh ifs/scripts/compile_dep.sh ) || (

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

           rm -f ${DEPS_COMMIT} &&

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

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

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

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

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

     )

  artifacts:
@@ -72,7 +72,7 @@ test wr: 
    - mkdir -p "${LOG_PATH}"

    - ${BUILD_PATH}/bin/adafs_daemon --mount /tmp/mountdir --root /tmp/adafs_root &

    - sleep 4

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/ifs_test_wr

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/gkfs_test_wr

  artifacts:

    paths:

     - "${LOG_PATH}"
@@ -83,7 +83,7 @@ test directories: 
    - mkdir -p "${LOG_PATH}"

    - ${BUILD_PATH}/bin/adafs_daemon --mount /tmp/mountdir --root /tmp/adafs_root &

    - sleep 4

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/ifs_test_dir

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/gkfs_test_dir

  artifacts:

    paths:

     - "${LOG_PATH}"
@@ -94,7 +94,7 @@ test truncate: 
    - mkdir -p "${LOG_PATH}"

    - ${BUILD_PATH}/bin/adafs_daemon --mount /tmp/mountdir --root /tmp/adafs_root &

    - sleep 4

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/ifs_test_truncate

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/gkfs_test_truncate

  artifacts:

    paths:

     - "${LOG_PATH}"
@@ -105,7 +105,7 @@ test path resolution: 
    - mkdir -p "${LOG_PATH}"

    - ${BUILD_PATH}/bin/adafs_daemon --mount /tmp/mountdir --root /tmp/adafs_root &

    - sleep 4

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/ifs_test_path_resolution

    - LD_PRELOAD=${BUILD_PATH}/lib/libadafs_preload_client.so ${TESTS_BUILD_PATH}/gkfs_test_path_resolution

  artifacts:

    paths:

     - "${LOG_PATH}"

CHANGELOG

+5 −1
Original line number Diff line number Diff line 
2018-03-06 Moved adafs version 0.1 and 0.2 to archive
 
============

v 0.3.1

============

Marc Vef:

 2018-03-04 Read-write process improved, adafs version to 0.3.1 with improved Filemap

ifs/CMake/FindAbt.cmake→CMake/FindAbt.cmake

+0 −0

File moved.

View file