From 5d24537520d020420785a151b87d83a1b10065bc Mon Sep 17 00:00:00 2001
From: Michael Youngstrom <youngstrom.m@husky.neu.edu>
Date: Thu, 28 Feb 2019 10:20:27 -0500
Subject: [PATCH 1/2] Move context to env var

---
 scripts/Jenkinsfiles/bokchoy | 4 ++--
 scripts/Jenkinsfiles/lettuce | 4 ++--
 scripts/Jenkinsfiles/python  | 4 ++--
 scripts/Jenkinsfiles/quality | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/Jenkinsfiles/bokchoy b/scripts/Jenkinsfiles/bokchoy
index fb6e3b0ecdd0..d0639e24ce06 100644
--- a/scripts/Jenkinsfiles/bokchoy
+++ b/scripts/Jenkinsfiles/bokchoy
@@ -47,7 +47,7 @@ pipeline {
                             string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                             string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                             string(name: 'DESCRIPTION', value: 'Pending'),
-                            string(name: 'CONTEXT', value: 'jenkins/bokchoy'),
+                            string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                             string(name: 'CREATE_DEPLOYMENT', value: 'false'),
                             string(name: 'BUILD_STATUS', value: 'pending')
                         ],
@@ -107,7 +107,7 @@ pipeline {
                             string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                             string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                             string(name: 'DESCRIPTION', value: build_description),
-                            string(name: 'CONTEXT', value: 'jenkins/bokchoy'),
+                            string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                             string(name: 'CREATE_DEPLOYMENT', value: create_deployment),
                             string(name: 'BUILD_STATUS', value: build_status)
                         ],
diff --git a/scripts/Jenkinsfiles/lettuce b/scripts/Jenkinsfiles/lettuce
index 1cf344707db2..852fee6ca34d 100644
--- a/scripts/Jenkinsfiles/lettuce
+++ b/scripts/Jenkinsfiles/lettuce
@@ -46,7 +46,7 @@ pipeline {
                             string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                             string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                             string(name: 'DESCRIPTION', value: 'Pending'),
-                            string(name: 'CONTEXT', value: 'jenkins/lettuce'),
+                            string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                             string(name: 'CREATE_DEPLOYMENT', value: 'false'),
                             string(name: 'BUILD_STATUS', value: 'pending')
                         ],
@@ -122,7 +122,7 @@ pipeline {
                             string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                             string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                             string(name: 'DESCRIPTION', value: build_description),
-                            string(name: 'CONTEXT', value: 'jenkins/lettuce'),
+                            string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                             string(name: 'CREATE_DEPLOYMENT', value: create_deployment),
                             string(name: 'BUILD_STATUS', value: build_status)
                         ],
diff --git a/scripts/Jenkinsfiles/python b/scripts/Jenkinsfiles/python
index 104a88243d13..412e9a6e55c9 100644
--- a/scripts/Jenkinsfiles/python
+++ b/scripts/Jenkinsfiles/python
@@ -63,7 +63,7 @@ pipeline {
                             string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                             string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                             string(name: 'DESCRIPTION', value: 'Pending'),
-                            string(name: 'CONTEXT', value: 'jenkins/python'),
+                            string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                             string(name: 'CREATE_DEPLOYMENT', value: 'false'),
                             string(name: 'BUILD_STATUS', value: 'pending')
                         ],
@@ -212,7 +212,7 @@ pipeline {
                             string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                             string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                             string(name: 'DESCRIPTION', value: build_description),
-                            string(name: 'CONTEXT', value: 'jenkins/python'),
+                            string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                             string(name: 'CREATE_DEPLOYMENT', value: create_deployment),
                             string(name: 'BUILD_STATUS', value: build_status)
                         ],
diff --git a/scripts/Jenkinsfiles/quality b/scripts/Jenkinsfiles/quality
index 2c520326e84f..396b2f258333 100644
--- a/scripts/Jenkinsfiles/quality
+++ b/scripts/Jenkinsfiles/quality
@@ -61,7 +61,7 @@ pipeline {
                             string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                             string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                             string(name: 'DESCRIPTION', value: 'Pending'),
-                            string(name: 'CONTEXT', value: 'jenkins/quality'),
+                            string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                             string(name: 'CREATE_DEPLOYMENT', value: 'false'),
                             string(name: 'BUILD_STATUS', value: 'pending')
                         ],
@@ -224,7 +224,7 @@ pipeline {
                                 string(name: 'GITHUB_REPO', value: "${REPO_NAME}"),
                                 string(name: 'TARGET_URL', value: "${BUILD_URL}"),
                                 string(name: 'DESCRIPTION', value: build_description),
-                                string(name: 'CONTEXT', value: 'jenkins/quality'),
+                                string(name: 'CONTEXT', value: "${GITHUB_CONTEXT}"),
                                 string(name: 'CREATE_DEPLOYMENT', value: create_deployment),
                                 string(name: 'BUILD_STATUS', value: build_status)
                             ],

From 370e82cea1820d40c3b29fe6c62c4aa2f21fbff2 Mon Sep 17 00:00:00 2001
From: Michael Youngstrom <youngstrom.m@husky.neu.edu>
Date: Thu, 28 Feb 2019 13:50:49 -0500
Subject: [PATCH 2/2] Change git checkout on xdist workers

---
 scripts/xdist/prepare_xdist_nodes.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/xdist/prepare_xdist_nodes.sh b/scripts/xdist/prepare_xdist_nodes.sh
index a647272d055d..af221f8f968a 100644
--- a/scripts/xdist/prepare_xdist_nodes.sh
+++ b/scripts/xdist/prepare_xdist_nodes.sh
@@ -7,12 +7,19 @@ python scripts/xdist/pytest_container_manager.py -a up -n ${XDIST_NUM_TASKS} \
 -s ${XDIST_CONTAINER_SUBNET} \
 -sg ${XDIST_CONTAINER_SECURITY_GROUP}
 
+# Need to map remote branch to local branch when fetching a branch other than master
+if [ "$XDIST_GIT_BRANCH" == "master" ]; then
+    XDIST_GIT_FETCH_STRING="$XDIST_GIT_BRANCH"
+else
+    XDIST_GIT_FETCH_STRING="$XDIST_GIT_BRANCH:$XDIST_GIT_BRANCH"
+fi
+
 ip_list=$(<pytest_task_ips.txt)
 for ip in $(echo $ip_list | sed "s/,/ /g")
 do
     container_reqs_cmd="ssh -o StrictHostKeyChecking=no ubuntu@$ip 'cd /edx/app/edxapp;
     git clone --branch master --depth 1 --no-tags -q https://github.com/edx/edx-platform.git; cd edx-platform;
-    git fetch --depth=1 --no-tags -q origin ${XDIST_GIT_BRANCH}; git checkout -q ${XDIST_GIT_BRANCH};
+    git fetch --depth=1 --no-tags -q origin ${XDIST_GIT_FETCH_STRING}; git checkout -q ${XDIST_GIT_BRANCH};
     source /edx/app/edxapp/edxapp_env; pip install -qr requirements/edx/testing.txt; mkdir reports' & "
 
     cmd=$cmd$container_reqs_cmd