Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
258c847c
Commit
258c847c
authored
Oct 21, 2019
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disallow running untagged jobs by default
Updates tests to provide tags where needed
parent
98f2f02a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
qa/qa/resource/runner.rb
qa/qa/resource/runner.rb
+0
-1
qa/qa/specs/features/ee/browser_ui/3_create/web_ide/web_terminal_spec.rb
...tures/ee/browser_ui/3_create/web_ide/web_terminal_spec.rb
+2
-1
qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
...s/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
+4
-2
qa/qa/specs/features/ee/browser_ui/6_release/pipelines_for_merged_results_and_merge_trains_spec.rb
...ase/pipelines_for_merged_results_and_merge_trains_spec.rb
+1
-0
No files found.
qa/qa/resource/runner.rb
View file @
258c847c
...
...
@@ -36,7 +36,6 @@ module QA
runner
.
tags
=
tags
runner
.
image
=
image
runner
.
config
=
config
if
config
runner
.
run_untagged
=
true
runner
.
register!
end
end
...
...
qa/qa/specs/features/ee/browser_ui/3_create/web_ide/web_terminal_spec.rb
View file @
258c847c
...
...
@@ -19,6 +19,7 @@ module QA
file_path:
'.gitlab/.gitlab-webide.yml'
,
content:
<<~
YAML
terminal:
tags: ["web-ide"]
script: sleep 60
YAML
}
...
...
@@ -29,7 +30,7 @@ module QA
@runner
=
Resource
::
Runner
.
fabricate_via_api!
do
|
runner
|
runner
.
project
=
project
runner
.
name
=
"qa-runner-
#{
Time
.
now
.
to_i
}
"
runner
.
tags
=
%w[
qa docker
web-ide]
runner
.
tags
=
%w[web-ide]
runner
.
image
=
'gitlab/gitlab-runner:latest'
runner
.
config
=
<<~
END
concurrent = 1
...
...
qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
View file @
258c847c
...
...
@@ -22,7 +22,7 @@ module QA
runner
.
project
=
upstream_project
runner
.
token
=
upstream_project
.
group
.
sandbox
.
runners_token
runner
.
name
=
upstream_project_name
runner
.
tags
=
%w[qa test
]
runner
.
tags
=
[
upstream_project_name
]
end
end
...
...
@@ -38,6 +38,7 @@ module QA
job1:
stage: test
tags: ["
#{
upstream_project_name
}
"]
script: echo "done"
staging:
...
...
@@ -55,6 +56,7 @@ module QA
project_push
.
file_content
=
<<~
CI
downstream_job:
stage: test
tags: ["
#{
upstream_project_name
}
"]
script: echo "done"
CI
end
...
...
@@ -74,7 +76,7 @@ module QA
it
'creates a multi-project pipeline'
do
Page
::
MergeRequest
::
Show
.
perform
do
|
show
|
pipeline_passed
=
show
.
retry_until
(
reload:
true
,
max_attempts:
10
,
sleep_interval:
5
)
do
pipeline_passed
=
show
.
retry_until
(
reload:
true
,
max_attempts:
20
,
sleep_interval:
6
)
do
show
.
has_content?
(
/Pipeline #\d+ passed/
)
end
...
...
qa/qa/specs/features/ee/browser_ui/6_release/pipelines_for_merged_results_and_merge_trains_spec.rb
View file @
258c847c
...
...
@@ -21,6 +21,7 @@ module QA
project_push
.
commit_message
=
'Add .gitlab-ci.yml'
project_push
.
file_content
=
<<~
EOF
test:
tags: ["qa"]
script: echo 'OK'
only:
- merge_requests
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment