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

Merge branch 'rnou/220-update-parallax-with-oficial-release' into 'master' 

Resolve "Update PARALLAX with oficial release"

Closes #220

See merge request !158
parents 380b8ca7 981c38d5

.gitlab-ci.yml

+10 −10
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ variables: 
  GIT_SUBMODULE_STRATEGY:       recursive



# base image

image: gekkofs/core:0.9.1

image: gekkofs/core:0.9.2



################################################################################

## Validating

################################################################################

check format:

  stage: lint

  image: gekkofs/linter:0.9.1

  image: gekkofs/linter:0.9.2

  needs: []

  script:

    - ${SCRIPTS_DIR}/check_format.sh
@@ -45,7 +45,7 @@ check format: 
################################################################################

gkfs:

  stage: build

  image: gekkofs/deps:0.9.1

  image: gekkofs/deps:0.9.2

  interruptible: true

  needs: []

  script:
@@ -81,7 +81,7 @@ gkfs: 


gkfwd:

  stage: build

  image: gekkofs/deps:0.9.1

  image: gekkofs/deps:0.9.2

  interruptible: true

  needs: []

  script:
@@ -116,7 +116,7 @@ gkfwd: 
## == tests for scripts ====================

scripts:

  stage: test

  image: gekkofs/testing:0.9.1

  image: gekkofs/testing:0.9.2

  needs: []

  script:

    - mkdir -p ${BUILD_PATH}/tests/scripts
@@ -132,7 +132,7 @@ scripts: 
## == integration tests for gkfs ===========

gkfs:integration:

  stage: test

  image: gekkofs/testing:0.9.1

  image: gekkofs/testing:0.9.2

  interruptible: true

  needs: ['gkfs']

  parallel:
@@ -178,7 +178,7 @@ gkfs:integration: 
## == integration tests for gkfwd ==========

gkfwd:integration:

  stage: test

  image: gekkofs/testing:0.9.1

  image: gekkofs/testing:0.9.2

  interruptible: true

  needs: ['gkfwd']

  parallel:
@@ -223,7 +223,7 @@ gkfwd:integration: 
## == unit tests for gkfs ==================

gkfs:unit:

  stage: test

  image: gekkofs/testing:0.9.1

  image: gekkofs/testing:0.9.2

  needs: ['gkfs']

  script:

    ## Add path to mkfs.kreon
@@ -254,7 +254,7 @@ gkfs:unit: 
################################################################################

documentation:

  stage: docs

  image: gekkofs/docs:0.9.1

  image: gekkofs/docs:0.9.2

  needs: []

  rules:

    # we only build the documentation automatically if we are on the
@@ -290,7 +290,7 @@ documentation: 
################################################################################

coverage:

  stage: report

  image: gekkofs/coverage:0.9.1

  image: gekkofs/coverage:0.9.2

  needs: [ 'gkfs:integration', 'gkfwd:integration', 'gkfs:unit' ]

  script:

    - cd ${BUILD_PATH}

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -11,12 +11,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 


- Additional tests to increase code coverage ([!141](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/141)).

- GKFS_ENABLE_UNUSED_FUNCTIONS added to disable code to increase code coverage.

- Updated Parallax version to new API (parallax option needs kv_format.parallax in the path, and the database in a device with O_DIRECT)



### Changed



- Support parallelism for path resolution tests ([!145](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/145))

  .

- Support parallelism for symlink tests ([!147](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/147)).

- Updatd Parallax release (PARALLAX-exp)



### Removed

docker/0.9.2/core/Dockerfile

0 → 100644
+39 −0
Original line number Diff line number Diff line 
FROM debian:bullseye-slim



LABEL Description="Debian-based environment suitable to build GekkoFS and its dependencies"



RUN apt-get update && \

    apt-get install -y --no-install-recommends \

		git \

		curl \

		ca-certificates \

		libtool \

		pkg-config \

		make \

		automake \

		gcc \

		g++ \

		procps \

		# AGIOS dependencies

		libconfig-dev \

		# Mercury dependencies

		libltdl-dev \

		lbzip2 \

        # Margo dependencies \

        libjson-c-dev \

		# RocksDB dependencies

		liblz4-dev \

		# syscall_intercept dependencies

		libcapstone-dev \

		# GekkoFS dependencies

		libboost-program-options-dev \

		uuid-dev && \

    # install cmake 3.14 since it's needed for some dependencies

    curl -OL https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.sh && \

    chmod u+x ./cmake-3.14.5-Linux-x86_64.sh && \

    ./cmake-3.14.5-Linux-x86_64.sh --skip-license --prefix=/usr && \

    # Clean apt cache to reduce image layer size

    rm -rf /var/lib/apt/lists/* && \

    # Clean apt caches of packages

    apt-get clean && apt-get autoclean && \

    rm ./cmake-3.14.5-Linux-x86_64.sh

docker/0.9.2/core/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
.PHONY: all



amd64:

	docker build --platform amd64 -t gekkofs/core:0.9.2 .



aarch64:

	docker build --platform aarch64 -t gekkofs/core:0.9.2 .



all:

	docker build -t gekkofs/core:0.9.2 .

docker/0.9.2/coverage/Dockerfile

0 → 100644
+20 −0
Original line number Diff line number Diff line 
FROM debian:bullseye-slim



LABEL Description="Environment to generate coverage reports in GekkoFS"



RUN apt-get update && \

    apt-get install -y --no-install-recommends \

        wget \

        git \

        cmake \

        gcc \

        g++ \

        lcov \

        python3 \

        python3-pip \

        python3-setuptools && \

    rm -rf /var/lib/apt/lists/* && \

    apt-get clean && \

    apt-get autoclean && \

    python3 -m pip install --upgrade pip && \

    pip3 install gcovr