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
46d77a8b
Commit
46d77a8b
authored
Dec 17, 2020
by
Alex Buijs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add create pipeline namespace onboarding action
For tracking onboarding progress
parent
e970bf06
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
148 additions
and
32 deletions
+148
-32
app/models/namespace.rb
app/models/namespace.rb
+4
-0
app/models/namespace_onboarding_action.rb
app/models/namespace_onboarding_action.rb
+9
-0
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+5
-0
app/services/onboarding_progress_service.rb
app/services/onboarding_progress_service.rb
+3
-1
app/workers/all_queues.yml
app/workers/all_queues.yml
+8
-0
app/workers/namespaces/onboarding_pipeline_created_worker.rb
app/workers/namespaces/onboarding_pipeline_created_worker.rb
+20
-0
config/sidekiq_queues.yml
config/sidekiq_queues.yml
+2
-0
ee/app/models/ee/namespace.rb
ee/app/models/ee/namespace.rb
+0
-4
ee/spec/models/ee/namespace_spec.rb
ee/spec/models/ee/namespace_spec.rb
+0
-20
spec/models/namespace_onboarding_action_spec.rb
spec/models/namespace_onboarding_action_spec.rb
+27
-1
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+20
-0
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+8
-0
spec/services/onboarding_progress_service_spec.rb
spec/services/onboarding_progress_service_spec.rb
+16
-6
spec/workers/namespaces/onboarding_pipeline_created_worker_spec.rb
...ers/namespaces/onboarding_pipeline_created_worker_spec.rb
+26
-0
No files found.
app/models/namespace.rb
View file @
46d77a8b
...
...
@@ -438,6 +438,10 @@ class Namespace < ApplicationRecord
end
end
def
root?
!
has_parent?
end
private
def
all_projects_with_pages
...
...
app/models/namespace_onboarding_action.rb
View file @
46d77a8b
...
...
@@ -10,9 +10,15 @@ class NamespaceOnboardingAction < ApplicationRecord
git_write:
2
,
merge_request_created:
3
,
git_read:
4
,
pipeline_created:
5
,
user_added:
6
}.
freeze
# The monitoring window prevents the recording of a namespace_onboarding_action if a namespace is created before this
# time span. We are not interested in older namspaces, because the purpose of this table is to monitor and act on the
# progress of newly created namespaces or namespaces that already have at least one recorded action.
MONITORING_WINDOW
=
90
.
days
enum
action:
ACTIONS
class
<<
self
...
...
@@ -21,6 +27,9 @@ class NamespaceOnboardingAction < ApplicationRecord
end
def
create_action
(
namespace
,
action
)
return
unless
namespace
.
root?
return
if
namespace
.
created_at
<
MONITORING_WINDOW
.
ago
&&
!
namespace
.
namespace_onboarding_actions
.
exists?
NamespaceOnboardingAction
.
safe_find_or_create_by
(
namespace:
namespace
,
action:
action
)
end
end
...
...
app/services/ci/create_pipeline_service.rb
View file @
46d77a8b
...
...
@@ -84,6 +84,7 @@ module Ci
if
pipeline
.
persisted?
schedule_head_pipeline_update
record_conversion_event
create_namespace_onboarding_action
end
# If pipeline is not persisted, try to recover IID
...
...
@@ -123,6 +124,10 @@ module Ci
Experiments
::
RecordConversionEventWorker
.
perform_async
(
:ci_syntax_templates
,
current_user
.
id
)
end
def
create_namespace_onboarding_action
Namespaces
::
OnboardingPipelineCreatedWorker
.
perform_async
(
project
.
namespace_id
)
end
def
extra_options
(
content:
nil
,
dry_run:
false
)
{
content:
content
,
dry_run:
dry_run
}
end
...
...
app/services/onboarding_progress_service.rb
View file @
46d77a8b
...
...
@@ -2,10 +2,12 @@
class
OnboardingProgressService
def
initialize
(
namespace
)
@namespace
=
namespace
.
root_ancestor
@namespace
=
namespace
&
.
root_ancestor
end
def
execute
(
action
:)
return
unless
@namespace
NamespaceOnboardingAction
.
create_action
(
@namespace
,
action
)
end
end
app/workers/all_queues.yml
View file @
46d77a8b
...
...
@@ -1795,6 +1795,14 @@
:weight:
1
:idempotent:
:tags: []
-
:name: namespaces_onboarding_pipeline_created
:feature_category: :subgroups
:has_external_dependencies:
:urgency: :low
:resource_boundary: :unknown
:weight:
1
:idempotent:
true
:tags: []
-
:name: namespaces_onboarding_user_added
:feature_category: :users
:has_external_dependencies:
...
...
app/workers/namespaces/onboarding_pipeline_created_worker.rb
0 → 100644
View file @
46d77a8b
# frozen_string_literal: true
module
Namespaces
class
OnboardingPipelineCreatedWorker
include
ApplicationWorker
feature_category
:subgroups
urgency
:low
deduplicate
:until_executing
idempotent!
def
perform
(
namespace_id
)
namespace
=
Namespace
.
find_by_id
(
namespace_id
)
return
unless
namespace
OnboardingProgressService
.
new
(
namespace
).
execute
(
action: :pipeline_created
)
end
end
end
config/sidekiq_queues.yml
View file @
46d77a8b
...
...
@@ -200,6 +200,8 @@
-
1
-
-
namespaceless_project_destroy
-
1
-
-
namespaces_onboarding_pipeline_created
-
1
-
-
namespaces_onboarding_user_added
-
1
-
-
new_epic
...
...
ee/app/models/ee/namespace.rb
View file @
46d77a8b
...
...
@@ -245,10 +245,6 @@ module EE
@ci_minutes_quota
||=
::
Ci
::
Minutes
::
Quota
.
new
(
self
)
end
def
root?
!
has_parent?
end
# The same method name is used also at project and job level
def
shared_runners_minutes_limit_enabled?
ci_minutes_quota
.
enabled?
...
...
ee/spec/models/ee/namespace_spec.rb
View file @
46d77a8b
...
...
@@ -646,26 +646,6 @@ RSpec.describe Namespace do
end
end
describe
'#root?'
do
subject
{
namespace
.
root?
}
context
'when is subgroup'
do
before
do
namespace
.
parent
=
build
(
:group
)
end
it
'returns false'
do
is_expected
.
to
eq
(
false
)
end
end
context
'when is root'
do
it
'returns true'
do
is_expected
.
to
eq
(
true
)
end
end
end
describe
'#shared_runners_minutes_limit_enabled?'
do
subject
{
namespace
.
shared_runners_minutes_limit_enabled?
}
...
...
spec/models/namespace_onboarding_action_spec.rb
View file @
46d77a8b
...
...
@@ -3,7 +3,7 @@
require
'spec_helper'
RSpec
.
describe
NamespaceOnboardingAction
do
let
(
:namespace
)
{
build
(
:namespace
)
}
let
(
:namespace
)
{
create
(
:namespace
)
}
describe
'associations'
do
it
{
is_expected
.
to
belong_to
(
:namespace
).
required
}
...
...
@@ -46,6 +46,32 @@ RSpec.describe NamespaceOnboardingAction do
expect
{
create_action
}.
to
change
{
count_namespace_actions
}.
by
(
0
)
end
context
'when the namespace is created outside the monitoring window'
do
let
(
:namespace
)
{
create
(
:namespace
,
created_at:
(
NamespaceOnboardingAction
::
MONITORING_WINDOW
+
1
.
day
).
ago
)
}
it
'does not create an action for the namespace'
do
expect
{
create_action
}.
not_to
change
{
count_namespace_actions
}
end
context
'when an action has already been recorded for the namespace'
do
before
do
described_class
.
create!
(
namespace:
namespace
,
action: :git_write
)
end
it
'creates an action for the namespace'
do
expect
{
create_action
}.
to
change
{
count_namespace_actions
}.
by
(
1
)
end
end
end
context
'when the namespace is not a root'
do
let
(
:namespace
)
{
create
(
:namespace
,
parent:
build
(
:namespace
))
}
it
'does not create an action for the namespace'
do
expect
{
create_action
}.
not_to
change
{
count_namespace_actions
}
end
end
def
count_namespace_actions
described_class
.
where
(
namespace:
namespace
,
action:
action
).
count
end
...
...
spec/models/namespace_spec.rb
View file @
46d77a8b
...
...
@@ -1500,4 +1500,24 @@ RSpec.describe Namespace do
end
end
end
describe
'#root?'
do
subject
{
namespace
.
root?
}
context
'when is subgroup'
do
before
do
namespace
.
parent
=
build
(
:group
)
end
it
'returns false'
do
is_expected
.
to
eq
(
false
)
end
end
context
'when is root'
do
it
'returns true'
do
is_expected
.
to
eq
(
true
)
end
end
end
end
spec/services/ci/create_pipeline_service_spec.rb
View file @
46d77a8b
...
...
@@ -489,6 +489,7 @@ RSpec.describe Ci::CreatePipelineService do
expect
(
execute_service
).
not_to
be_persisted
expect
(
Ci
::
Pipeline
.
count
).
to
eq
(
0
)
expect
(
Namespaces
::
OnboardingPipelineCreatedWorker
).
not_to
receive
(
:perform_async
)
end
shared_examples
'a failed pipeline'
do
...
...
@@ -1426,6 +1427,13 @@ RSpec.describe Ci::CreatePipelineService do
pipeline
end
it
'schedules a namespace onboarding create action worker'
do
expect
(
Namespaces
::
OnboardingPipelineCreatedWorker
)
.
to
receive
(
:perform_async
).
with
(
project
.
namespace_id
)
pipeline
end
context
'when target sha is specified'
do
let
(
:target_sha
)
{
merge_request
.
target_branch_sha
}
...
...
spec/services/onboarding_progress_service_spec.rb
View file @
46d77a8b
...
...
@@ -5,29 +5,39 @@ require 'spec_helper'
RSpec
.
describe
OnboardingProgressService
do
describe
'#execute'
do
let
(
:namespace
)
{
create
(
:namespace
,
parent:
root_namespace
)
}
let
(
:root_namespace
)
{
nil
}
let
(
:action
)
{
:namespace_action
}
subject
(
:execute_service
)
{
described_class
.
new
(
namespace
).
execute
(
action: :subscription_created
)
}
context
'when the namespace is a root'
do
let
(
:root_namespace
)
{
nil
}
it
'records a namespace onboarding progress action for the given namespace'
do
it
'records a namespace onboarding progress action fot the given namespace'
do
expect
(
NamespaceOnboardingAction
).
to
receive
(
:create_action
)
.
with
(
namespace
,
:subscription_created
).
and_call_original
.
with
(
namespace
,
:subscription_created
).
and_call_original
expect
{
execute_service
}.
to
change
(
NamespaceOnboardingAction
,
:count
).
by
(
1
)
end
end
context
'when the namespace is not the root'
do
let
_it_be
(
:root_namespace
)
{
build
(
:namespace
)
}
let
(
:root_namespace
)
{
build
(
:namespace
)
}
it
'records a namespace onboarding progress action for the root namespace'
do
expect
(
NamespaceOnboardingAction
).
to
receive
(
:create_action
)
.
with
(
root_namespace
,
:subscription_created
).
and_call_original
.
with
(
root_namespace
,
:subscription_created
).
and_call_original
expect
{
execute_service
}.
to
change
(
NamespaceOnboardingAction
,
:count
).
by
(
1
)
end
end
context
'when no namespace is passed'
do
let
(
:namespace
)
{
nil
}
it
'does not record a namespace onboarding progress action'
do
expect
(
NamespaceOnboardingAction
).
not_to
receive
(
:create_action
)
execute_service
end
end
end
end
spec/workers/namespaces/onboarding_pipeline_created_worker_spec.rb
0 → 100644
View file @
46d77a8b
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
Namespaces
::
OnboardingPipelineCreatedWorker
,
'#perform'
do
include
AfterNextHelpers
let_it_be
(
:ci_pipeline
)
{
create
(
:ci_pipeline
)
}
it
'records the event'
do
expect_next
(
OnboardingProgressService
,
ci_pipeline
.
project
.
namespace
)
.
to
receive
(
:execute
).
with
(
action: :pipeline_created
).
and_call_original
expect
do
subject
.
perform
(
ci_pipeline
.
project
.
namespace_id
)
end
.
to
change
(
NamespaceOnboardingAction
,
:count
).
by
(
1
)
end
context
"when a namespace doesn't exist"
do
it
"does nothing"
do
expect_next
(
OnboardingProgressService
,
ci_pipeline
.
project
.
namespace
).
not_to
receive
(
:execute
)
expect
{
subject
.
perform
(
nil
)
}.
not_to
change
(
NamespaceOnboardingAction
,
:count
)
end
end
end
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