Skip to content

Edit worker type in ironwood Jenkinsfiles #19875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelyoungstrom merged 1 commit into from
Feb 26, 2019
Merged

Edit worker type in ironwood Jenkinsfiles #19875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/Jenkinsfiles/bokchoy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def bokchoyTestCleanup() {
}

pipeline {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
options {
timestamps()
timeout(60)
Expand Down Expand Up @@ -62,7 +62,7 @@ pipeline {
for (int i = 1; i <= 22; i++) {
int index = i
parallel_stages["${index}"] = {
node('jenkins-worker') {
node('ironwood-jenkins-worker') {
withEnv(["SHARD=${index}","TEST_SUITE=bok-choy"]) {
try {
stage("Bokchoy shard: ${index}") {
Expand Down
6 changes: 3 additions & 3 deletions scripts/Jenkinsfiles/lettuce
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def lettuceTestCleanup() {
}

pipeline {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
options {
timestamps()
timeout(60)
Expand Down Expand Up @@ -57,7 +57,7 @@ pipeline {
stage('Run Tests') {
parallel {
stage("lms-acceptance") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "lms-acceptance"
}
Expand All @@ -75,7 +75,7 @@ pipeline {
}
}
stage("cms-acceptance") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "cms-acceptance"
}
Expand Down
10 changes: 5 additions & 5 deletions scripts/Jenkinsfiles/python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ def xdist_git_branch() {
}

pipeline {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
options {
timestamps()
timeout(60)
}
environment {
XDIST_CONTAINER_SUBNET = credentials('XDIST_CONTAINER_SUBNET')
XDIST_CONTAINER_SECURITY_GROUP = credentials('XDIST_CONTAINER_SECURITY_GROUP')
XDIST_CONTAINER_TASK_NAME = "jenkins-worker-task"
XDIST_CONTAINER_TASK_NAME = "ironwood-jenkins-worker-task"
XDIST_GIT_BRANCH = xdist_git_branch()
}
stages {
Expand Down Expand Up @@ -74,7 +74,7 @@ pipeline {
stage('Run Tests') {
parallel {
stage("lms-unit") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "lms-unit"
XDIST_NUM_TASKS = 10
Expand All @@ -94,7 +94,7 @@ pipeline {
}
}
stage("cms-unit") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "cms-unit"
XDIST_NUM_TASKS = 3
Expand All @@ -114,7 +114,7 @@ pipeline {
}
}
stage("commonlib-unit") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "commonlib-unit"
XDIST_NUM_TASKS = 3
Expand Down
10 changes: 5 additions & 5 deletions scripts/Jenkinsfiles/quality
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def qualityTestCleanup() {
}

pipeline {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
options {
timestamps()
timeout(60)
Expand Down Expand Up @@ -72,7 +72,7 @@ pipeline {
stage('Run Tests') {
parallel {
stage("commonlib pylint") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "quality"
SHARD = 1
Expand All @@ -91,7 +91,7 @@ pipeline {
}
}
stage("lms pylint") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "quality"
SHARD = 2
Expand All @@ -110,7 +110,7 @@ pipeline {
}
}
stage("cms/openedx/pavelib pylint") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "quality"
SHARD = 3
Expand All @@ -129,7 +129,7 @@ pipeline {
}
}
stage("Other quality checks") {
agent { label "jenkins-worker" }
agent { label "ironwood-jenkins-worker" }
environment {
TEST_SUITE = "quality"
SHARD = 4
Expand Down