Commit 2fb78d59 authored by Marco Govoni's avatar Marco Govoni
Browse files

Update .gitlab-ci.yml

parent 1bd20b09
...@@ -6,9 +6,8 @@ stages: ...@@ -6,9 +6,8 @@ stages:
- test - test
- doc - doc
.template_bot: .template_bot_start:
tags: [rcc,docker,node-01] tags: [rcc,docker,node-01]
stage: build
image: miccomcenter/bot:$CI_JOB_NAME image: miccomcenter/bot:$CI_JOB_NAME
before_script: before_script:
- if [ -z $GCC_VERSION ]; then echo "not set"; else echo $GCC_VERSION; fi - if [ -z $GCC_VERSION ]; then echo "not set"; else echo $GCC_VERSION; fi
...@@ -20,6 +19,9 @@ stages: ...@@ -20,6 +19,9 @@ stages:
- if [ -z $FFTW_VERSION ]; then echo "not set"; else echo $FFTW_VERSION; fi - if [ -z $FFTW_VERSION ]; then echo "not set"; else echo $FFTW_VERSION; fi
- if [ -z PYTHON_VERSION ]; then echo "not set"; else echo $PYTHON_VERSION; fi - if [ -z PYTHON_VERSION ]; then echo "not set"; else echo $PYTHON_VERSION; fi
- if [ -z PYTHON_PIP_VERSION ]; then echo "not set"; else echo $PYTHON_PIP_VERSION; fi - if [ -z PYTHON_PIP_VERSION ]; then echo "not set"; else echo $PYTHON_PIP_VERSION; fi
.template_build:
stage: build
script: script:
- git clone -b 'qe-6.1.0' --single-branch --depth 1 https://gitlab.com/QEF/q-e.git QEDIR - git clone -b 'qe-6.1.0' --single-branch --depth 1 https://gitlab.com/QEF/q-e.git QEDIR
- cd QEDIR - cd QEDIR
...@@ -32,25 +34,67 @@ stages: ...@@ -32,25 +34,67 @@ stages:
- git describe - git describe
- make - make
- ls ../bin - ls ../bin
.template_test:
stage: test
script:
- git clone -b 'qe-6.1.0' --single-branch --depth 1 https://gitlab.com/QEF/q-e.git QEDIR
- cd QEDIR
- git describe
- ./configure
- make -j pw
- ls bin
- git clone -b $CI_COMMIT_REF_NAME $CI_REPOSITORY_URL West
- cd West
- make > /dev/null
- useradd -m qe
- cp -r test-suite /home/qe
- su - qe
- cd test-suite
- make NP=14 NI=1 NT=1
gcc650_0001: gcc650_0001:
extends: .template_bot extends:
- .template_bot_start
- .template_build
gcc650_0002: gcc650_0002:
extends: .template_bot extends:
- .template_bot_start
- .template_build
gcc740_0001: gcc740_0001:
extends: .template_bot extends:
- .template_bot_start
- .template_build
gcc740_0002: gcc740_0002:
extends: .template_bot extends:
- .template_bot_start
- .template_build
gcc830_0001: gcc830_0001:
extends: .template_bot extends:
- .template_bot_start
- .template_build
gcc830_0002: gcc830_0002:
extends: .template_bot extends:
- .template_bot_start
- .template_build
gcc830_0001_t:
extends:
- .template_bot_start
- .template_test
image: miccomcenter/bot:gcc830_0001
gcc830_0002_t:
extends:
- .template_bot_start
- .template_test
image: miccomcenter/bot:gcc830_0002
#west_build_gcc: #west_build_gcc:
# tags: [rcc,docker,node-01] # tags: [rcc,docker,node-01]
# stage: build # stage: build
...@@ -222,42 +266,28 @@ gcc830_0002: ...@@ -222,42 +266,28 @@ gcc830_0002:
# - cd test-suite # - cd test-suite
# - make NP=14 NI=1 NT=1 # - make NP=14 NI=1 NT=1
gcc830_0001: #gcc830_0001:
extends: .template_bot # extends: .template_bot
script: # script:
- git clone -b 'qe-6.1.0' --single-branch --depth 1 https://gitlab.com/QEF/q-e.git QEDIR # - git clone -b 'qe-6.1.0' --single-branch --depth 1 https://gitlab.com/QEF/q-e.git QEDIR
- cd QEDIR # - cd QEDIR
- git describe # - git describe
- ./configure # - ./configure
- make -j pw # - make -j pw
- ls bin # - ls bin
- git clone -b $CI_COMMIT_REF_NAME $CI_REPOSITORY_URL West # - git clone -b $CI_COMMIT_REF_NAME $CI_REPOSITORY_URL West
- cd West # - cd West
- make > /dev/null # - make > /dev/null
- useradd -m qe # - useradd -m qe
- cp -r test-suite /home/qe # - cp -r test-suite /home/qe
- su - qe # - su - qe
- cd test-suite # - cd test-suite
- make NP=14 NI=1 NT=1 # - make NP=14 NI=1 NT=1
gcc830_0002: #gcc830_0002:
extends: .template_bot # extends: .template_bot
script:
- git clone -b 'qe-6.1.0' --single-branch --depth 1 https://gitlab.com/QEF/q-e.git QEDIR
- cd QEDIR
- git describe
- ./configure
- make -j pw
- ls bin
- git clone -b $CI_COMMIT_REF_NAME $CI_REPOSITORY_URL West
- cd West
- make > /dev/null
- useradd -m qe
- cp -r test-suite /home/qe
- su - qe
- cd test-suite
- make NP=14 NI=1 NT=1
west_doc_build: west_doc_build:
tags: [rcc,docker,node-01] tags: [rcc,docker,node-01]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment