Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into cache
Browse files Browse the repository at this point in the history
  • Loading branch information
mkuron committed Sep 29, 2019
2 parents c643377 + e7ee0a0 commit 60d7eb3
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ stages:
- build
- test
- deploy
- cleanup
- status

.manual_template:
Expand Down Expand Up @@ -243,16 +242,6 @@ ubuntu:s390x:
- .deploy_template
- .manual_template

cleanup:
stage: cleanup
image: $CI_REGISTRY/espressomd/docker/ubuntu-python3:18.04
script: bash maintainer/docker_clean.sh
only:
- schedules
timeout: 15m
tags:
- linux

status_success:
stage: status
image: $CI_REGISTRY/espressomd/docker/ubuntu-python3:18.04
Expand Down

0 comments on commit 60d7eb3

Please sign in to comment.