Commit 2ae7ca40 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'marc/255-gekkofs-v0-9-2-dependency-bump' into 'master' 

Resolve "GekkoFS v0.9.3 dependency bump"

Links to #274 

Closes #255

Closes #255

See merge request !165
parents 471a7739 c2404130

.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.3

image: gekkofs/core:0.9.3-rc1



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

## Validating

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

check format:

  stage: lint

  image: gekkofs/linter:0.9.3

  image: gekkofs/linter:0.9.3-rc1

  needs: []

  script:

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

gkfs:

  stage: build

  image: gekkofs/deps:0.9.3

  image: gekkofs/deps:0.9.3-rc1

  interruptible: true

  needs: []

  script:
@@ -72,7 +72,7 @@ gkfs: 
## == tests for scripts ====================

scripts:

  stage: test

  image: gekkofs/testing:0.9.3

  image: gekkofs/testing:0.9.3-rc1

  needs: []

  script:

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

gkfs:integration:

  stage: test

  image: gekkofs/testing:0.9.3

  image: gekkofs/testing:0.9.3-rc1

  interruptible: true

  needs: ['gkfs']

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

gkfwd:integration:

  stage: test

  image: gekkofs/testing:0.9.3

  image: gekkofs/testing:0.9.3-rc1

  interruptible: true

  needs: ['gkfs']

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

gkfs:unit:

  stage: test

  image: gekkofs/testing:0.9.3

  image: gekkofs/testing:0.9.3-rc1

  needs: ['gkfs']

  script:

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

documentation:

  stage: docs

  image: gekkofs/docs:0.9.3

  image: gekkofs/docs:0.9.3-rc1

  needs: []

  rules:

    # we only build the documentation automatically if we are on the
@@ -255,7 +255,7 @@ documentation: 
## == coverage baseline ====================

coverage:baseline:

  stage: report

  image: gekkofs/testing:0.9.3

  image: gekkofs/testing:0.9.3-rc1

  interruptible: true

  needs: ['gkfs']
@@ -281,7 +281,7 @@ coverage:baseline: 


coverage:

  stage: report

  image: gekkofs/testing:0.9.3

  image: gekkofs/testing:0.9.3-rc1

#  needs: [ 'coverage:baseline', 'gkfs:integration', 'gkfwd:integration',

#           'gkfs:unit' ]

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

CHANGELOG.md

+9 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 


## [Unreleased]

### New

- Adding user library `gkfs_user_lib` that can be used to directly link to an application ([!171](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/171)).



- Added user library `gkfs_user_lib` that can be used to directly link to an

  application ([!171](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/171)).

- FMT10 and date removal, several dependencies updated. ([!172](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/172)).

- Fused GekkoFWD and GekkoFS. GekkoFWD is enabled with the `--enable-following` in the server configuration and the ENV variable

    `LIBGKFS_FORWARDING_MAP_FILE` in the clients. ([!170](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/170)).
@@ -18,6 +20,12 @@ replicas ([!166](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/141) 




### Changed



- Updated GekkoFS dependencies migrating to

  margo-shim-hg ([!165](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_request/165)).

  - Improves RPC stability

  - Removes manual updates to Mercury public IDs from Hermes-Mercury to Margo



### Removed

### Fixed

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ find_package(PkgConfig REQUIRED) 


### Mercury

message(STATUS "[${PROJECT_NAME}] Checking for Mercury")

find_package(Mercury 2.0.1 REQUIRED)

find_package(Mercury 2.2.0 REQUIRED)



### Argobots

message(STATUS "[${PROJECT_NAME}] Checking for Argobots")
@@ -155,7 +155,7 @@ find_package(Argobots 1.1 REQUIRED) 


### Margo

message(STATUS "[${PROJECT_NAME}] Checking for Margo")

find_package(Margo 0.9.6 REQUIRED)

find_package(Margo 0.14.0 REQUIRED)



### syscall-intercept

message(STATUS "[${PROJECT_NAME}] Checking for syscall_intercept")

docker/0.9.3/core/Makefile

+3 −3
Original line number Diff line number Diff line 
.PHONY: all



amd64:

	docker buildx build --platform amd64 -t gekkofs/core:0.9.3 .

	docker buildx build --platform amd64 -t gekkofs/core:0.9.3-rc1 .



aarch64:

	docker buildx build --platform aarch64 -t gekkofs/core:0.9.3 .

	docker buildx build --platform aarch64 -t gekkofs/core:0.9.3-rc1 .



all:

	docker buildx build -t gekkofs/core:0.9.3 .
 
	docker buildx build -t gekkofs/core:0.9.3-rc1 .

docker/0.9.3/deps/Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM gekkofs/core:0.9.3

FROM gekkofs/core:0.9.3-rc1



LABEL Description="Debian-based environment to build GekkoFS"