summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-02-13 13:34:13 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-02-13 13:34:13 +0000
commitde67c5972084847c1517d1cf9e347cdb39a1a1ae (patch)
treea009114b4defd961986033618fd1d327e8db7c31
parent97bd016fe9f09c400c87513b19475ee357c8d7eb (diff)
parent68a2ddd1495b6c6b5fd56018f50eecc553e14562 (diff)
downloadgitlab-ce-de67c5972084847c1517d1cf9e347cdb39a1a1ae.tar.gz
Merge branch 'qa/mk-fix-artifact-creation' into 'master'
Fix artifact creation in CI/CD QA spec See merge request gitlab-org/gitlab-ce!17078
-rw-r--r--qa/qa/specs/features/project/pipelines_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/specs/features/project/pipelines_spec.rb b/qa/qa/specs/features/project/pipelines_spec.rb
index 1bb7730e06c..74f6474443d 100644
--- a/qa/qa/specs/features/project/pipelines_spec.rb
+++ b/qa/qa/specs/features/project/pipelines_spec.rb
@@ -69,7 +69,7 @@ module QA
tags:
- qa
- test
- script: echo "CONTENTS" > my-artifacts/artifact.txt
+ script: mkdir my-artifacts; echo "CONTENTS" > my-artifacts/artifact.txt
artifacts:
paths:
- my-artifacts/
@@ -95,7 +95,7 @@ module QA
expect(pipeline).to have_build('test-success', status: :success)
expect(pipeline).to have_build('test-failure', status: :failed)
expect(pipeline).to have_build('test-tags', status: :pending)
- expect(pipeline).to have_build('test-artifacts', status: :failed)
+ expect(pipeline).to have_build('test-artifacts', status: :success)
end
end
end