diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-05-09 15:17:00 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-05-09 15:17:00 +0200 |
| commit | 8c063c9e5f9e88ddea9645d0ed873e4f948909bc (patch) | |
| tree | 35c6a0c03c9d761ea360c5545b5b6a89649609d7 | |
| parent | 75bdf7f94b5ff7bbbcde665eaa59ffa3ecb73a5a (diff) | |
| download | gitlab-ce-jv-gitaly-0.98.0.tar.gz | |
revert unnecessary changejv-gitaly-0.98.0
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | scripts/setup-test-env-ci | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2703757359..9c1eb2736b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -432,7 +432,7 @@ setup-test-env: cache: <<: *default-cache script: - - scripts/setup-test-env-ci + - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' - scripts/gitaly-test-build # Do not use 'bundle exec' here artifacts: expire_in: 7d diff --git a/scripts/setup-test-env-ci b/scripts/setup-test-env-ci deleted file mode 100755 index 9f0fd8660ad..00000000000 --- a/scripts/setup-test-env-ci +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init(start_gitaly: false)' |