Skip to content
Snippets Groups Projects
Commit a393ba66 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

up

parent f3ab173f
No related branches found
No related tags found
1 merge request!3F fix pipeline
Pipeline #5246 passed
...@@ -40,8 +40,6 @@ build-testenv: ...@@ -40,8 +40,6 @@ build-testenv:
timeout: 3h timeout: 3h
only: only:
- schedules - schedules
#TODO remove before merge
- f-fix-pipeline
script: script:
- cd src/test/docker - cd src/test/docker
- time docker load < /image-cache/caosdb-server-testenv.tar || true - time docker load < /image-cache/caosdb-server-testenv.tar || true
...@@ -72,7 +70,7 @@ trigger_build: ...@@ -72,7 +70,7 @@ trigger_build:
stage: deploy stage: deploy
script: script:
- /usr/bin/curl -X POST - /usr/bin/curl -X POST
-F token=$DEPLOY_TRIGGER_TOKEN -F token=$CI_JOB_TOKEN
-F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME" -F "variables[F_BRANCH]=$CI_COMMIT_REF_NAME"
-F "variables[SERVER]=$CI_COMMIT_REF_NAME" -F "variables[SERVER]=$CI_COMMIT_REF_NAME"
-F "variables[TriggerdBy]=SERVER" -F "variables[TriggerdBy]=SERVER"
...@@ -80,9 +78,6 @@ trigger_build: ...@@ -80,9 +78,6 @@ trigger_build:
-F ref=$DEPLOY_REF https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline -F ref=$DEPLOY_REF https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline
# Build the sphinx documentation and make it ready for deployment by Gitlab Pages # Build the sphinx documentation and make it ready for deployment by Gitlab Pages
# documentation:
# stage: deploy
# Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages # Special job for serving a static website. See https://docs.gitlab.com/ee/ci/yaml/README.html#pages
pages: pages:
tags: [ cached-dind ] tags: [ cached-dind ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment