Skip to content
Extraits de code Groupes Projets
Valider 73d5c988 rédigé par Bastien Le Querrec's avatar Bastien Le Querrec
Parcourir les fichiers

ci: supprime des instructions redondantes

parent 338cec40
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 35 ajouts et 213 suppressions
.gitlab-ci.yml
+ 35
− 213
Voir le fichier @ 73d5c988
...@@ -30,33 +30,6 @@ docker: ...@@ -30,33 +30,6 @@ docker:
- Dockerfile-base - Dockerfile-base
- if: $COMPILE_DOCKER - if: $COMPILE_DOCKER
test_ppparis:
stage: test
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest
tags:
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/ppparis/* || true
- rm artifacts.zip || true
- source bin/activate
- python ./cli.py --pref ppparis
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/ppparis/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
install: install:
stage: install stage: install
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest image: registry.git.laquadrature.net/bastien/raaspotter/base:latest
...@@ -75,7 +48,7 @@ install: ...@@ -75,7 +48,7 @@ install:
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_pref06: .default_pref:
stage: test stage: test
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest image: registry.git.laquadrature.net/bastien/raaspotter/base:latest
tags: tags:
...@@ -83,11 +56,11 @@ test_pref06: ...@@ -83,11 +56,11 @@ test_pref06:
needs: [install] needs: [install]
script: script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true - curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref06/* || true - unzip -q artifacts.zip data/"${PREF}"/* || true
- rm artifacts.zip || true - rm artifacts.zip || true
- source bin/activate - source bin/activate
- /etc/init.d/tor start - /etc/init.d/tor start
- python ./cli.py --pref pref06 - python ./cli.py --pref "${PREF}"
retry: 2 retry: 2
cache: cache:
key: $CI_COMMIT_REF_SLUG key: $CI_COMMIT_REF_SLUG
...@@ -97,204 +70,53 @@ test_pref06: ...@@ -97,204 +70,53 @@ test_pref06:
- pyvenv.cfg - pyvenv.cfg
artifacts: artifacts:
paths: paths:
- data/pref06/*.txt - data/${PREF}/*.txt
- output.log - output.log
expire_in: 1 hour expire_in: 1 hour
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_ppparis:
variables:
PREF: "ppparis"
extends: .default_pref
test_pref06:
variables:
PREF: "pref06"
extends: .default_pref
test_pref13: test_pref13:
stage: test variables:
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest PREF: "pref13"
tags: extends: .default_pref
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref13/* || true
- rm artifacts.zip || true
- source bin/activate
- /etc/init.d/tor start
- python ./cli.py --pref pref13
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/pref13/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_pref34: test_pref34:
stage: test variables:
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest PREF: "pref34"
tags: extends: .default_pref
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref34/* || true
- rm artifacts.zip || true
- source bin/activate
- /etc/init.d/tor start
- python ./cli.py --pref pref34
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/pref34/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_pref35: test_pref35:
stage: test variables:
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest PREF: "pref35"
tags: extends: .default_pref
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref35/* || true
- rm artifacts.zip || true
- source bin/activate
- /etc/init.d/tor start
- python ./cli.py --pref pref35
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/pref35/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_pref38: test_pref38:
stage: test variables:
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest PREF: "pref38"
tags: extends: .default_pref
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref38/* || true
- rm artifacts.zip || true
- source bin/activate
- /etc/init.d/tor start
- python ./cli.py --pref pref38
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/pref38/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_pref59: test_pref59:
stage: test variables:
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest PREF: "pref59"
tags: extends: .default_pref
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref59/* || true
- rm artifacts.zip || true
- source bin/activate
- /etc/init.d/tor start
- python ./cli.py --pref pref59
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/pref59/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_pref62: test_pref62:
stage: test variables:
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest PREF: "pref62"
tags: extends: .default_pref
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref62/* || true
- rm artifacts.zip || true
- source bin/activate
- /etc/init.d/tor start
- python ./cli.py --pref pref62
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/pref62/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
test_pref69: test_pref69:
stage: test variables:
image: registry.git.laquadrature.net/bastien/raaspotter/base:latest PREF: "pref69"
tags: extends: .default_pref
- unprivileged
needs: [install]
script:
- curl --silent --location --output artifacts.zip "${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/jobs/artifacts/${CI_COMMIT_BRANCH}/download?job=${CI_JOB_NAME}&job_token=${CI_JOB_TOKEN}" || true
- unzip -q artifacts.zip data/pref69/* || true
- rm artifacts.zip || true
- source bin/activate
- /etc/init.d/tor start
- python ./cli.py --pref pref69
retry: 2
cache:
key: $CI_COMMIT_REF_SLUG
paths:
- bin/
- lib/
- pyvenv.cfg
artifacts:
paths:
- data/pref69/*.txt
- output.log
expire_in: 1 hour
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $COMPILE_DOCKER == null
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter