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
412ecb83
Commit
412ecb83
authored
Dec 02, 2020
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Get job id with artifact path"
This reverts commit
fc1887ef
.
parent
4be83b5b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
39 deletions
+10
-39
scripts/api/get_job_id
scripts/api/get_job_id
+4
-31
scripts/rspec_helpers.sh
scripts/rspec_helpers.sh
+6
-8
No files found.
scripts/api/get_job_id
View file @
412ecb83
...
@@ -20,7 +20,6 @@ class JobFinder
...
@@ -20,7 +20,6 @@ class JobFinder
@job_query
=
options
.
delete
(
:job_query
)
@job_query
=
options
.
delete
(
:job_query
)
@pipeline_id
=
options
.
delete
(
:pipeline_id
)
@pipeline_id
=
options
.
delete
(
:pipeline_id
)
@job_name
=
options
.
delete
(
:job_name
)
@job_name
=
options
.
delete
(
:job_name
)
@artifact_path
=
options
.
delete
(
:artifact_path
)
# Force the token to be a string so that if api_token is nil, it's set to '', allowing unauthenticated requests (for forks).
# Force the token to be a string so that if api_token is nil, it's set to '', allowing unauthenticated requests (for forks).
api_token
=
options
.
delete
(
:api_token
).
to_s
api_token
=
options
.
delete
(
:api_token
).
to_s
...
@@ -34,31 +33,19 @@ class JobFinder
...
@@ -34,31 +33,19 @@ class JobFinder
end
end
def
execute
def
execute
find_job_with_
artifact
||
find_job_with_
filtered_pipelines
||
find_job_in_pipeline
find_job_with_filtered_pipelines
||
find_job_in_pipeline
end
end
private
private
attr_reader
:project
,
:pipeline_query
,
:job_query
,
:pipeline_id
,
:job_name
,
:artifact_path
attr_reader
:project
,
:pipeline_query
,
:job_query
,
:pipeline_id
,
:job_name
def
find_job_with_artifact
return
if
artifact_path
.
nil?
Gitlab
.
pipelines
(
project
,
pipeline_query_params
).
auto_paginate
do
|
pipeline
|
Gitlab
.
pipeline_jobs
(
project
,
pipeline
.
id
,
job_query_params
).
auto_paginate
do
|
job
|
return
job
if
found_job_with_artifact?
(
job
)
# rubocop:disable Cop/AvoidReturnFromBlocks
end
end
raise
'Job not found!'
end
def
find_job_with_filtered_pipelines
def
find_job_with_filtered_pipelines
return
if
pipeline_query
.
empty?
return
if
pipeline_query
.
empty?
Gitlab
.
pipelines
(
project
,
pipeline_query_params
).
auto_paginate
do
|
pipeline
|
Gitlab
.
pipelines
(
project
,
pipeline_query_params
).
auto_paginate
do
|
pipeline
|
Gitlab
.
pipeline_jobs
(
project
,
pipeline
.
id
,
job_query_params
).
auto_paginate
do
|
job
|
Gitlab
.
pipeline_jobs
(
project
,
pipeline
.
id
,
job_query_params
).
auto_paginate
do
|
job
|
return
job
if
found_job_by_name?
(
job
)
# rubocop:disable Cop/AvoidReturnFromBlocks
return
job
if
job
.
name
==
job_name
# rubocop:disable Cop/AvoidReturnFromBlocks
end
end
end
end
...
@@ -69,22 +56,12 @@ class JobFinder
...
@@ -69,22 +56,12 @@ class JobFinder
return
unless
pipeline_id
return
unless
pipeline_id
Gitlab
.
pipeline_jobs
(
project
,
pipeline_id
,
job_query_params
).
auto_paginate
do
|
job
|
Gitlab
.
pipeline_jobs
(
project
,
pipeline_id
,
job_query_params
).
auto_paginate
do
|
job
|
return
job
if
found_job_by_name?
(
job
)
# rubocop:disable Cop/AvoidReturnFromBlocks
return
job
if
job
.
name
==
job_name
# rubocop:disable Cop/AvoidReturnFromBlocks
end
end
raise
'Job not found!'
raise
'Job not found!'
end
end
def
found_job_with_artifact?
(
job
)
artifact_url
=
"https://gitlab.com/api/v4/projects/
#{
CGI
.
escape
(
project
)
}
/jobs/
#{
job
.
id
}
/artifacts/
#{
artifact_path
}
"
response
=
HTTParty
.
head
(
artifact_url
)
# rubocop:disable Gitlab/HTTParty
response
.
success?
end
def
found_job_by_name?
(
job
)
job
.
name
==
job_name
end
def
pipeline_query_params
def
pipeline_query_params
@pipeline_query_params
||=
{
per_page:
100
,
**
pipeline_query
}
@pipeline_query_params
||=
{
per_page:
100
,
**
pipeline_query
}
end
end
...
@@ -118,10 +95,6 @@ if $0 == __FILE__
...
@@ -118,10 +95,6 @@ if $0 == __FILE__
options
[
:job_name
]
=
value
options
[
:job_name
]
=
value
end
end
opts
.
on
(
"-a"
,
"--artifact-path ARTIFACT_PATH"
,
String
,
"A valid artifact path"
)
do
|
value
|
options
[
:artifact_path
]
=
value
end
opts
.
on
(
"-t"
,
"--api-token API_TOKEN"
,
String
,
"A value API token with the `read_api` scope"
)
do
|
value
|
opts
.
on
(
"-t"
,
"--api-token API_TOKEN"
,
String
,
"A value API token with the `read_api` scope"
)
do
|
value
|
options
[
:api_token
]
=
value
options
[
:api_token
]
=
value
end
end
...
...
scripts/rspec_helpers.sh
View file @
412ecb83
...
@@ -17,14 +17,12 @@ function retrieve_tests_metadata() {
...
@@ -17,14 +17,12 @@ function retrieve_tests_metadata() {
scripts/api/download_job_artifact
--project
"
${
project_path
}
"
--job-id
"
${
test_metadata_job_id
}
"
--artifact-path
"
${
FLAKY_RSPEC_SUITE_REPORT_PATH
}
"
||
echo
"{}"
>
"
${
FLAKY_RSPEC_SUITE_REPORT_PATH
}
"
scripts/api/download_job_artifact
--project
"
${
project_path
}
"
--job-id
"
${
test_metadata_job_id
}
"
--artifact-path
"
${
FLAKY_RSPEC_SUITE_REPORT_PATH
}
"
||
echo
"{}"
>
"
${
FLAKY_RSPEC_SUITE_REPORT_PATH
}
"
fi
fi
local
test_metadata_with_mapping_job_id
# FIXME: We will need to find a pipeline where the $RSPEC_PACKED_TESTS_MAPPING_PATH.gz actually exists (Crystalball only runs every two-hours, but the `update-tests-metadata` runs for all `master` pipelines...).
test_metadata_with_mapping_job_id
=
$(
scripts/api/get_job_id
--project
"
${
project_path
}
"
-q
"status=success"
-q
"ref=master"
-q
"username=gitlab-bot"
-Q
"scope=success"
--job-name
"update-tests-metadata"
--artifact-path
"
${
RSPEC_PACKED_TESTS_MAPPING_PATH
}
.gz"
)
# if [[ ! -f "${RSPEC_PACKED_TESTS_MAPPING_PATH}" ]]; then
# (scripts/api/download_job_artifact --project "${project_path}" --job-id "${test_metadata_job_id}" --artifact-path "${RSPEC_PACKED_TESTS_MAPPING_PATH}.gz" && gzip -d "${RSPEC_PACKED_TESTS_MAPPING_PATH}.gz") || echo "{}" > "${RSPEC_PACKED_TESTS_MAPPING_PATH}"
if
[[
!
-f
"
${
RSPEC_PACKED_TESTS_MAPPING_PATH
}
"
]]
;
then
# fi
(
scripts/api/download_job_artifact
--project
"
${
project_path
}
"
--job-id
"
${
test_metadata_job_id
}
"
--artifact-path
"
${
RSPEC_PACKED_TESTS_MAPPING_PATH
}
.gz"
&&
gzip
-d
"
${
RSPEC_PACKED_TESTS_MAPPING_PATH
}
.gz"
)
||
echo
"{}"
>
"
${
RSPEC_PACKED_TESTS_MAPPING_PATH
}
"
#
fi
# scripts/unpack-test-mapping "${RSPEC_PACKED_TESTS_MAPPING_PATH}" "${RSPEC_TESTS_MAPPING_PATH}"
scripts/unpack-test-mapping
"
${
RSPEC_PACKED_TESTS_MAPPING_PATH
}
"
"
${
RSPEC_TESTS_MAPPING_PATH
}
"
}
}
function
update_tests_metadata
()
{
function
update_tests_metadata
()
{
...
...
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