Commit 905e96bc authored by Enrique Garcia's avatar Enrique Garcia
Browse files

Merge branch 'update_docker' into 'master'

Update docker env

See merge request !13
parents 25c1dbad e0ebd30b
Pipeline #106192 passed with stages
in 2 minutes and 43 seconds
......@@ -66,16 +66,29 @@ deploy_zenodo:
only:
### Ideally this stage should be run only when a new release / tag of the source code is created, i.e., (- tags).
# The script is changed to check that the both `upload_new_deposit` and `upload_new_version_deposit` works nicely.
- tags
- branches # For testing
#deploy_from_container:
# stage: deploy
# image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci:v1.1
# before_script:
# - test_connection_zenodo --token $ZENODO_TOKEN --sandbox False -p $CI_PROJECT_DIR
# script:
# - mkdir -p build
# - parse_last_release_git.sh $CI_PROJECT_NAME $CI_PROJECT_URL
# - ls ./build
#
# - upload_new_deposit --token $ZENODO_TOKEN --sandbox False --input-dir ./build
# only:
# - tags
test_deploy_from_container:
stage: test_container
image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci
image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci:v1.1
before_script:
- wget -q https://gitlab.in2p3.fr/escape2020/wp3/zenodoci/-/raw/master/zenodoci/parse_last_release.sh
- pwd parse_last_release.sh # testing/debugging
- which parse_last_release_git.sh
- test_connection_zenodo --token $SANDBOX_ZENODO_TOKEN --sandbox True -p $CI_PROJECT_DIR
script:
- pwd # testing/debugging
......@@ -87,11 +100,10 @@ test_deploy_from_container:
- codemeta2zenodo -h
- mkdir -p build
- /bin/bash parse_last_release.sh $CI_PROJECT_NAME $CI_PROJECT_URL
- parse_last_release_git.sh $CI_PROJECT_NAME $CI_PROJECT_URL
- ls ./build
- upload_new_deposit --token $SANDBOX_ZENODO_TOKEN --sandbox True --input-dir ./build
- upload_new_version_deposit -t $SANDBOX_ZENODO_TOKEN -s True -i ./build -id $ZENODO_PROJECT_ID
only:
- tags
- branches # testing/debugging
......@@ -3,9 +3,5 @@ FROM continuumio/miniconda3
ENV PATH=/opt/conda/bin/:${PATH}
SHELL [ "/bin/bash", "-c"]
RUN conda install git pip wget && \
# pip install git+https://gitlab.in2p3.fr/escape2020/wp3/zenodoci
git clone https://gitlab.in2p3.fr/escape2020/wp3/zenodoci.git
WORKDIR zenodoci
RUN pip install .
WORKDIR ..
RUN conda install git pip && \
pip --no-cache-dir install git+https://gitlab.in2p3.fr/escape2020/wp3/zenodoci
......@@ -48,19 +48,18 @@ The code to be added to the `.gitlab-ci.yml` file is the following (**COMMON FOR
```
stages:
- `(...) all your CI stages (...)`
- deploy_to_zenodo
- deploy
`(...) All the code to be run in your CI pipeline (...)`
deploy:
stage: deploy_to_zenodo
image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci
deploy_to_zenodo:
stage: deploy
image: gitlab-registry.in2p3.fr/escape2020/wp3/zenodoci:v1.1
before_script:
- wget -q https://gitlab.in2p3.fr/escape2020/wp3/zenodoci/-/raw/master/zenodoci/parse_last_release.sh
- test_connection_zenodo --token $ZENODO_TOKEN --sandbox False -p $CI_PROJECT_DIR
script:
- mkdir -p build
- /bin/bash parse_last_release.sh $CI_PROJECT_NAME $CI_PROJECT_URL
- parse_last_release_git.sh $CI_PROJECT_NAME $CI_PROJECT_URL
- ls ./build
- upload_new_deposit --token $SANDBOX_ZENODO_TOKEN --sandbox True --input-dir ./build
......
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