mirror of
https://github.com/cp2k/cp2k.git
synced 2026-07-21 06:25:15 -04:00
Fix circular dependency
This commit is contained in:
parent
da287098b2
commit
70b5527ee6
4 changed files with 5 additions and 5 deletions
|
|
@ -21,7 +21,7 @@ build deps daint:
|
|||
stage: deps
|
||||
timeout: 1h
|
||||
before_script:
|
||||
- DEPS_IMAGE_TAG=`cat ci/cscs_daint_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- DEPS_IMAGE_TAG=`cat make_cp2k.sh ci/cscs_daint_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- export PERSIST_IMAGE_NAME=${CSCS_REGISTRY_PATH}/base/${REPOSITORY}:${TAG}_${DEPS_IMAGE_TAG}
|
||||
- echo "DEPS_IMAGE_NAME=${PERSIST_IMAGE_NAME}" | tee build.env
|
||||
artifacts:
|
||||
|
|
@ -117,7 +117,7 @@ benchmark cp2k 1 daint node:
|
|||
SLURM_TIMELIMIT: 30
|
||||
USE_MPI: YES
|
||||
|
||||
benchmark cp2k 1 daint node:
|
||||
benchmark cp2k 1 daint node elpa:
|
||||
extends: .container-runner-daint-gh200
|
||||
stage: benchmark
|
||||
needs: ["build cp2k daint","test cp2k daint","benchmark cp2k 1 daint node"]
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ build deps daint:
|
|||
stage: deps
|
||||
timeout: 1h
|
||||
before_script:
|
||||
- DEPS_IMAGE_TAG=`cat ci/cscs_daint_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- DEPS_IMAGE_TAG=`cat make_cp2k.sh ci/cscs_daint_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- export PERSIST_IMAGE_NAME=${CSCS_REGISTRY_PATH}/base/${REPOSITORY}:${TAG}_${DEPS_IMAGE_TAG}
|
||||
- echo "DEPS_IMAGE_NAME=${PERSIST_IMAGE_NAME}" | tee build.env
|
||||
artifacts:
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ build deps eiger:
|
|||
stage: deps
|
||||
timeout: 1h
|
||||
before_script:
|
||||
- DEPS_IMAGE_TAG=`cat ci/cscs_eiger_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- DEPS_IMAGE_TAG=`cat make_cp2k.sh ci/cscs_eiger_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- export PERSIST_IMAGE_NAME=${CSCS_REGISTRY_PATH}/base/${REPOSITORY}:${TAG}_${DEPS_IMAGE_TAG}
|
||||
- echo "DEPS_IMAGE_NAME=${PERSIST_IMAGE_NAME}" | tee build.env
|
||||
artifacts:
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ build deps eiger:
|
|||
stage: deps
|
||||
timeout: 1h
|
||||
before_script:
|
||||
- DEPS_IMAGE_TAG=`cat ci/cscs_eiger_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- DEPS_IMAGE_TAG=`cat make_cp2k.sh ci/cscs_eiger_${TAG}.yaml ci/docker/build_${CI_JOB_STAGE}_${BUILDER}.Dockerfile $(find tools/spack -type f) $(find cmake -type f) | sha256sum - | head -c 16`
|
||||
- export PERSIST_IMAGE_NAME=${CSCS_REGISTRY_PATH}/base/${REPOSITORY}:${TAG}_${DEPS_IMAGE_TAG}
|
||||
- echo "DEPS_IMAGE_NAME=${PERSIST_IMAGE_NAME}" | tee build.env
|
||||
artifacts:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue