|
59 | 59 |
|
60 | 60 | if [[ $DRONE_BRANCH == "master" || $DRONE_BRANCH == "releases/"* ]] && [[ $DRONE_REPO == "vmware/vic" ]] && [[ $DRONE_BUILD_EVENT == "push" ]]; then |
61 | 61 | echo "Running full CI for $DRONE_BUILD_EVENT on $DRONE_BRANCH" |
62 | | - pabot --verbose --processes $jobs --removekeywords TAG:secret --exclude skip tests/test-cases |
63 | | - test_custom_iso |
| 62 | + pabot --verbose --processes $jobs --removekeywords TAG:secret --exclude skip tests/test-cases && test_custom_iso |
64 | 63 | elif [[ $DRONE_REPO == "vmware/vic" ]] && [[ $DRONE_BUILD_EVENT == "tag" ]]; then |
65 | 64 | echo "Running only Group11-Upgrade and 7-01-Regression for $DRONE_BUILD_EVENT on $DRONE_BRANCH" |
66 | 65 | pabot --verbose --processes $jobs --removekeywords TAG:secret --suite Group11-Upgrade --suite 7-01-Regression tests/test-cases |
67 | 66 | elif (echo $prBody | grep -q "\[full ci\]"); then |
68 | 67 | echo "Running full CI as per commit message" |
69 | | - pabot --verbose --processes $jobs --removekeywords TAG:secret --exclude skip tests/test-cases |
70 | | - test_custom_iso |
| 68 | + pabot --verbose --processes $jobs --removekeywords TAG:secret --exclude skip tests/test-cases && test_custom_iso |
71 | 69 | elif (echo $prBody | grep -q "\[specific ci="); then |
72 | 70 | echo "Running specific CI as per commit message" |
73 | 71 | buildtype=$(echo $prBody | grep "\[specific ci=") |
74 | 72 | testsuite=$(echo $buildtype | awk -F"\[specific ci=" '{sub(/\].*/,"",$2);print $2}') |
75 | | - pabot --verbose --processes $jobs --removekeywords TAG:secret --suite $testsuite --suite 7-01-Regression tests/test-cases |
| 73 | + pabot --verbose --processes $jobs --removekeywords TAG:secret --suite $testsuite --suite 7-01-Regression tests/test-cases && \ |
76 | 74 | pabot --verbose --processes $jobs --removekeywords TAG:secret -v BOOTSTRAP-ISO:$bootstrapiso --outputdir $bootstrapdir --suite $testsuite --suite 7-01-Regression tests/test-cases |
77 | 75 | else |
78 | 76 | echo "Running regressions" |
79 | | - pabot --verbose --processes $jobs --removekeywords TAG:secret --exclude skip --include regression tests/test-cases |
80 | | - test_custom_iso |
| 77 | + pabot --verbose --processes $jobs --removekeywords TAG:secret --exclude skip --include regression tests/test-cases && \ |
| 78 | + pabot --verbose --processes $jobs --removekeywords TAG:secret -v BOOTSTRAP-ISO:$bootstrapiso --outputdir $bootstrapdir --exclude skip --include regression tests/test-cases |
81 | 79 | fi |
82 | 80 |
|
83 | 81 | rc="$?" |
|
0 commit comments