Commit 0dc5238e authored by Jean-Francois Rey's avatar Jean-Francois Rey

Merge branch 'revert-9accb730' into 'master'

Revert "try to use cache between mergeData and buildDocker"

See merge request !10
parents 817c5a2e ac45ddad
Pipeline #1983 failed with stages
in 4 minutes and 26 seconds
......@@ -71,10 +71,10 @@ mergeData:
script:
- 'cd R && Rscript main_forecast_plotly.R "merge"'
- "curl --request POST --form token=$TRIGGERTOKEN --form ref=master https://gitlab.paca.inrae.fr/api/v4/projects/105/trigger/pipeline"
cache:
key: data-cache
artifacts:
paths:
- R/list_figures.rds
expire_in: 1 week
## Build docker image of the R shiny app
## using DockerFile and register it in the
......@@ -89,13 +89,10 @@ buildImageDocker:
DOCKER_DRIVER: overlay2
services:
- docker:19.03.0-dind
cache:
key: data-cache
before_script:
#- 'apk add --update curl'
#- 'curl --header "PRIVATE-TOKEN: $PTOKEN" -o artifacts.zip "https://gitlab.paca.inrae.fr/api/v4/projects/105/jobs/artifacts/master/download?job=mergeData"'
#- "unzip -o artifacts.zip && mv R/list_figures.rds www/list_figures.rds"
- "cp R/list_figures.rds www/list_figures.rds"
- 'apk add --update curl'
- 'curl --header "PRIVATE-TOKEN: $PTOKEN" -o artifacts.zip "https://gitlab.paca.inrae.fr/api/v4/projects/105/jobs/artifacts/master/download?job=mergeData"'
- "unzip -o artifacts.zip && mv R/list_figures.rds www/list_figures.rds"
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
stage: build_img
rules:
......
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