github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47614 from mengqiy/fix_naming

Browse Source 
Automatic merge from submit-queue

fix naming for testgrid to pick up cmd test junit

Fixes #47613

The file name for testgrid to pick up should match regex `'junit(_[^_]+)?(_\d+-\d+)?(_\d+)?.xml'`
Name before is `junit-test-cmd.xml`
Name after is `junit_test-cmd.xml`

```release-note
NONE
```

/assign @krzyzacy
This commit is contained in:
Kubernetes Submit Queue 2017-07-19 21:51:49 -07:00 committed by GitHub
commit ec2fa9d46c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
third_party/forked/shell2junit/sh2ju.sh vendored
View File

@ -146,17 +146,17 @@ $errMsg
" "
## testsuite block ## testsuite block
if [[ -e "$juDIR/junit-$suite.xml" ]]; then if [[ -e "$juDIR/junit_$suite.xml" ]]; then
# file exists. first update the failures count # file exists. first update the failures count
failCount=`sed -n "s/.*testsuite.*failures=\"\([0-9]*\)\".*/\1/p" "$juDIR/junit-$suite.xml"` failCount=`sed -n "s/.*testsuite.*failures=\"\([0-9]*\)\".*/\1/p" "$juDIR/junit_$suite.xml"`
errors=$(($failCount+$errors)) errors=$(($failCount+$errors))
sed -i "0,/failures=\"$failCount\"/ s/failures=\"$failCount\"/failures=\"$errors\"/" "$juDIR/junit-$suite.xml" sed -i "0,/failures=\"$failCount\"/ s/failures=\"$failCount\"/failures=\"$errors\"/" "$juDIR/junit_$suite.xml"
sed -i "0,/errors=\"$failCount\"/ s/errors=\"$failCount\"/errors=\"$errors\"/" "$juDIR/junit-$suite.xml" sed -i "0,/errors=\"$failCount\"/ s/errors=\"$failCount\"/errors=\"$errors\"/" "$juDIR/junit_$suite.xml"
# file exists. Need to append to it. If we remove the testsuite end tag, we can just add it in after. # file exists. Need to append to it. If we remove the testsuite end tag, we can just add it in after.
sed -i "s^</testsuite>^^g" $juDIR/junit-$suite.xml ## remove testSuite so we can add it later sed -i "s^</testsuite>^^g" $juDIR/junit_$suite.xml ## remove testSuite so we can add it later
sed -i "s^</testsuites>^^g" $juDIR/junit-$suite.xml sed -i "s^</testsuites>^^g" $juDIR/junit_$suite.xml
cat <<EOF >> "$juDIR/junit-$suite.xml" cat <<EOF >> "$juDIR/junit_$suite.xml"
$content $content
</testsuite> </testsuite>
</testsuites> </testsuites>
@ -164,7 +164,7 @@ EOF
else else
# no file exists. Adding a new file # no file exists. Adding a new file
cat <<EOF > "$juDIR/junit-$suite.xml" cat <<EOF > "$juDIR/junit_$suite.xml"
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<testsuites> <testsuites>
<testsuite failures="$errors" assertions="$assertions" name="$suite" tests="1" errors="$errors" time="$total"> <testsuite failures="$errors" assertions="$assertions" name="$suite" tests="1" errors="$errors" time="$total">