diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-07 13:10:40 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-07 13:10:40 +0200 |
commit | 9b76bb30e834d2fc78f628cd16b00f2e77f305fe (patch) | |
tree | 2cef531f18f1e910ac25b021a04adb0f828fd1f2 /.gitlab-ci.yml | |
parent | 03a7569ea6952b47c3f25294e94cb3abf1877d5d (diff) | |
download | gitlab-ce-9b76bb30e834d2fc78f628cd16b00f2e77f305fe.tar.gz |
Fix .gitlab-ci.ymlknapsack
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 095c9005d1f..764b82889ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ stages: # Prepare and merge knapsack tests -.knapsack_state: &knapsack_state +.knapsack-state: &knapsack-state services: [] variables: USE_DB: "false" @@ -48,7 +48,7 @@ stages: - knapsack/ knapsack: - <<: *rspec-knapsack_state + <<: *knapsack-state stage: prepare script: - mkdir -p knapsack/ @@ -56,7 +56,7 @@ knapsack: - '[[ -f knapsack/spinach_report.json ]] || echo "{}" > knapsack/spinach_report.json' update-knapsack: - <<: *rspec-knapsack_state + <<: *knapsack-state stage: post-test script: - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json @@ -65,7 +65,7 @@ update-knapsack: # Execute all testing suites -.rspec-knapsack: &knapsack +.rspec-knapsack: &rspec-knapsack stage: test script: - bundle exec rake assets:precompile 2>/dev/null @@ -80,7 +80,7 @@ update-knapsack: paths: - knapsack/ -.spinach-knapsack: &knapsack +.spinach-knapsack: &spinach-knapsack stage: test script: - bundle exec rake assets:precompile 2>/dev/null @@ -131,7 +131,7 @@ spinach 9 10: *spinach-knapsack # Execute all testing suites against Ruby 2.2 -.ruby-22: &ruby22 +.ruby-22: &ruby-22 image: "ruby:2.2" only: - master |