Merge tag 'open-release/juniper.3' into appsembler/juniper/master

.dockerignore

@@ -1,6 +1,7 @@
 *
 !playbooks/
 !docker/build/*
+!docker/devstack_common_ansible_overrides.yml
 !docker/build/*/*.yml
 docker/build/*/Dockerfile
 !docker/plays/

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,9 +3,10 @@ Configuration Pull Request
 
 Make sure that the following steps are done before merging:
 
-  - [ ] A DevOps team member has approved the PR.
+  - [ ] A DevOps team member has approved the PR if it is code shared across multiple services and you don't own all of the services.
   - [ ] Are you adding any new default values that need to be overridden when this change goes live? If so:
     - [ ] Update the appropriate internal repo (be sure to update for all our environments)
     - [ ] If you are updating a secure value rather than an internal one, file a DEVOPS ticket with details.
     - [ ] Add an entry to the CHANGELOG.
   - [ ] If you are making a complicated change, have you performed the proper testing specified on the [Ops Ansible Testing Checklist](https://openedx.atlassian.net/wiki/display/EdxOps/Ops+Ansible+Testing+Checklist)?  Adding a new variable does not require the full list (although testing on a sandbox is a great idea to ensure it links with your downstream code changes).
+  - [ ] Think about how this change will affect Open edX operators.  Have you updated the wiki page for the next Open edX release?

.travis.yml

@@ -1,13 +1,16 @@
 # Travis CI configuration file for running tests
 ---
 language: python
+dist: xenial
 python:
-  - "2.7"
+  - 3.5
+  - 3.8
 
 branches:
   only:
   - master
   - appsembler/hawthorn/master
+  - appsembler/juniper/master
 
 services:
   - docker
@@ -16,27 +19,23 @@ addons:
   apt:
     packages:
       - nodejs
-      - python-demjson
 
 before_install:
   - sudo apt-get -y update
   - sudo apt-get -y install -o Dpkg::Options::="--force-confold" docker-ce
 
 install:
-  - "pip install -r requirements.txt"
   - "pip install demjson"
+  - "pip install -r requirements.txt"
 
 env:
   - MAKE_TARGET=test.syntax SHARD=0 SHARDS=1
   - MAKE_TARGET=test.playbooks SHARD=0 SHARDS=1
-  - MAKE_TARGET=docker.test.shard SHARD=0 SHARDS=3
-  - MAKE_TARGET=docker.test.shard SHARD=1 SHARDS=3
-  - MAKE_TARGET=docker.test.shard SHARD=2 SHARDS=3
 
 script:
   - docker --version
   - make --version
-  - travis_wait 50 make --keep-going $MAKE_TARGET SHARD=$SHARD SHARDS=$SHARDS
+  - travis_wait 90 make --keep-going $MAKE_TARGET SHARD=$SHARD SHARDS=$SHARDS
 
 # Appsembler addition to automatically push
 # our hawthorn image
@@ -46,3 +45,7 @@ after_success:
       travis_wait 50 docker build -f docker/build/edxapp/Dockerfile . -t appsembler/edxapp:latest ;
       docker push appsembler/edxapp:latest ;
     fi
+
+matrix:
+  allow_failures:
+    - python: 3.8

AUTHORS

@@ -58,3 +58,6 @@ Jillian Vogel <[email protected]>
 Zubair Afzal <[email protected]>
 Kyle McCormick <[email protected]>
 Muzaffar Yousaf <[email protected]>
+Dave St.Germain <[email protected]>
+Rabia Iftikhar <[email protected]>
+Mostafa Hussein <[email protected]>