Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #19672 from edx/youngstrom/balance-shards

Browse Source 
Bump bokchoy shards and rebalance to decrease test times
This commit is contained in:
Michael Youngstrom
2019-01-30 15:44:32 -05:00
committed by GitHub
parent ccd546d494 0f3d0b69d6
commit 6a43ae2a5d
29 changed files with 132 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Jenkinsfiles/bokchoy
View File

@@ -29,7 +29,7 @@ pipeline {
agent { label "jenkins-worker" }
options {
timestamps()
timeout(75)
timeout(60)
}
stages {
stage('Mark build as pending on Github') {
@@ -59,7 +59,7 @@ pipeline {
steps {
script {
def parallel_stages = [:]
for (int i = 1; i <= 22; i++) {
for (int i = 1; i <= 25; i++) {
int index = i
parallel_stages["${index}"] = {
node('jenkins-worker') {

6
scripts/generic-ci-tests.sh
View File

@@ -193,12 +193,12 @@ case "$TEST_SUITE" in
$TOX paver test_bokchoy $PAVER_ARGS
;;
[1-9]|1[0-9]|2[0-1])
[1-9]|1[0-9]|2[0-4])
$TOX paver test_bokchoy --eval-attr="shard==$SHARD and not a11y" $PAVER_ARGS
;;
22|"noshard")
$TOX paver test_bokchoy --eval-attr='not shard and not a11y' $PAVER_ARGS
25|"noshard")
$TOX paver test_bokchoy --eval-attr="(shard>=$SHARD or not shard) and not a11y" $PAVER_ARGS
;;
# Default case because if we later define another bok-choy shard on Jenkins