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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
60583bf9
Commit
60583bf9
authored
Jul 18, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make manual actions to work with master code
parent
20438213
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
67 additions
and
1 deletion
+67
-1
app/models/ci/build.rb
app/models/ci/build.rb
+1
-1
app/models/commit_status.rb
app/models/commit_status.rb
+4
-0
spec/models/ci/pipeline_spec.rb
spec/models/ci/pipeline_spec.rb
+62
-0
No files found.
app/models/ci/build.rb
View file @
60583bf9
...
@@ -15,7 +15,7 @@ module Ci
...
@@ -15,7 +15,7 @@ module Ci
scope
:with_artifacts
,
->
()
{
where
.
not
(
artifacts_file:
nil
)
}
scope
:with_artifacts
,
->
()
{
where
.
not
(
artifacts_file:
nil
)
}
scope
:with_expired_artifacts
,
->
()
{
with_artifacts
.
where
(
'artifacts_expire_at < ?'
,
Time
.
now
)
}
scope
:with_expired_artifacts
,
->
()
{
with_artifacts
.
where
(
'artifacts_expire_at < ?'
,
Time
.
now
)
}
scope
:last_month
,
->
()
{
where
(
'created_at > ?'
,
Date
.
today
-
1
.
month
)
}
scope
:last_month
,
->
()
{
where
(
'created_at > ?'
,
Date
.
today
-
1
.
month
)
}
scope
:manual_actions
,
->
()
{
where
(
when: :manual
)
.
relevant
}
scope
:manual_actions
,
->
()
{
where
(
when: :manual
)
}
mount_uploader
:artifacts_file
,
ArtifactUploader
mount_uploader
:artifacts_file
,
ArtifactUploader
mount_uploader
:artifacts_metadata
,
ArtifactUploader
mount_uploader
:artifacts_metadata
,
ArtifactUploader
...
...
app/models/commit_status.rb
View file @
60583bf9
...
@@ -22,6 +22,10 @@ class CommitStatus < ActiveRecord::Base
...
@@ -22,6 +22,10 @@ class CommitStatus < ActiveRecord::Base
scope
:ignored
,
->
{
where
(
allow_failure:
true
,
status:
[
:failed
,
:canceled
])
}
scope
:ignored
,
->
{
where
(
allow_failure:
true
,
status:
[
:failed
,
:canceled
])
}
state_machine
:status
,
initial: :pending
do
state_machine
:status
,
initial: :pending
do
event
:queue
do
transition
skipped: :pending
end
event
:run
do
event
:run
do
transition
pending: :running
transition
pending: :running
end
end
...
...
spec/models/ci/pipeline_spec.rb
View file @
60583bf9
...
@@ -260,6 +260,68 @@ describe Ci::Pipeline, models: true do
...
@@ -260,6 +260,68 @@ describe Ci::Pipeline, models: true do
expect
(
pipeline
.
reload
.
status
).
to
eq
(
'canceled'
)
expect
(
pipeline
.
reload
.
status
).
to
eq
(
'canceled'
)
end
end
end
end
context
'when listing manual actions'
do
let
(
:yaml
)
do
{
stages:
[
"build"
,
"test"
,
"test_failure"
,
"deploy"
,
"cleanup"
],
build:
{
stage:
"build"
,
script:
"BUILD"
,
},
test:
{
stage:
"test"
,
script:
"TEST"
,
},
test_failure:
{
stage:
"test_failure"
,
script:
"ON test failure"
,
when:
"on_failure"
,
},
deploy:
{
stage:
"deploy"
,
script:
"PUBLISH"
,
},
production:
{
stage:
"deploy"
,
script:
"PUBLISH"
,
when:
"manual"
,
},
cleanup:
{
stage:
"cleanup"
,
script:
"TIDY UP"
,
when:
"always"
,
},
clear_cache:
{
stage:
"cleanup"
,
script:
"CLEAR CACHE"
,
when:
"manual"
,
}
}
end
it
'returns only for skipped builds'
do
# currently all builds are created
expect
(
create_builds
).
to
be_truthy
expect
(
manual_actions
).
to
be_empty
# succeed stage build
pipeline
.
builds
.
running_or_pending
.
each
(
&
:success
)
expect
(
manual_actions
).
to
be_empty
# succeed stage test
pipeline
.
builds
.
running_or_pending
.
each
(
&
:success
)
expect
(
manual_actions
).
to
be_one
# production
# succeed stage deploy
pipeline
.
builds
.
running_or_pending
.
each
(
&
:success
)
expect
(
manual_actions
).
to
be_many
# production and clear cache
end
def
manual_actions
pipeline
.
manual_actions
end
end
end
end
context
'when no builds created'
do
context
'when no builds created'
do
...
...
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