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
e8d09d80
Commit
e8d09d80
authored
Sep 30, 2019
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix missing knapsack report file in gitlab-foss
This moves copying of the report file outside the EE conditional
parent
1bad6b07
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
scripts/rspec_helpers.sh
scripts/rspec_helpers.sh
+2
-2
No files found.
scripts/rspec_helpers.sh
View file @
e8d09d80
...
...
@@ -63,6 +63,8 @@ function rspec_paralellized_job() {
export
KNAPSACK_LOG_LEVEL
=
"debug"
export
KNAPSACK_REPORT_PATH
=
"knapsack/
${
test_tool
}
_
${
test_level
}
_
${
database
}
_
${
CI_NODE_INDEX
}
_
${
CI_NODE_TOTAL
}
_report.json"
cp
"
${
KNAPSACK_RSPEC_SUITE_REPORT_PATH
}
"
"
${
KNAPSACK_REPORT_PATH
}
"
if
[[
-z
"
${
KNAPSACK_TEST_FILE_PATTERN
}
"
]]
;
then
pattern
=
$(
ruby
-r
./lib/quality/test_level.rb
-e
"puts Quality::TestLevel.new(%(
${
spec_folder_prefix
}
)).pattern(:
${
test_level
}
)"
)
export
KNAPSACK_TEST_FILE_PATTERN
=
"
${
pattern
}
"
...
...
@@ -77,8 +79,6 @@ function rspec_paralellized_job() {
export
FLAKY_RSPEC_REPORT_PATH
=
"rspec_flaky/all_
${
test_tool
}
_
${
CI_NODE_INDEX
}
_
${
CI_NODE_TOTAL
}
_report.json"
export
NEW_FLAKY_RSPEC_REPORT_PATH
=
"rspec_flaky/new_
${
test_tool
}
_
${
CI_NODE_INDEX
}
_
${
CI_NODE_TOTAL
}
_report.json"
cp
"
${
KNAPSACK_RSPEC_SUITE_REPORT_PATH
}
"
"
${
KNAPSACK_REPORT_PATH
}
"
if
[[
!
-f
$FLAKY_RSPEC_REPORT_PATH
]]
;
then
echo
"{}"
>
"
${
FLAKY_RSPEC_REPORT_PATH
}
"
fi
...
...
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