Updating test matrix

https://pulp.plan.io/issues/5768
ref #5768

.travis.yml

@@ -15,11 +15,29 @@ language: python
 matrix:
   include:
     - python: 2.7
-      env: TOXENV=py27
+      env: TOXENV=py27-static
+    - python: 2.7
+      if: type = cron
+      env: TOXENV=py27-dynamic
+    - python: 2.7
+      if: type = cron
+      env: TOXENV=py27-upgrade
+    - python: 3.6
+      if: type = cron
+      env: TOXENV=py36-static
     - python: 3.6
-      env: TOXENV=py36
+      env: TOXENV=py36-dynamic
+    - python: 3.6
+      if: type = cron
+      env: TOXENV=py36-upgrade
+    - python: 3.7
+      if: type = cron
+      env: TOXENV=py37-static
+    - python: 3.7
+      if: type = cron
+      env: TOXENV=py37-dynamic
     - python: 3.7
-      env: TOXENV=py37
+      env: TOXENV=py37-upgrade
 before_install:
   .travis/before_install.sh
   # Created template_config.yml with plugin_template,

.travis/before_install.sh

@@ -48,34 +48,34 @@ cd ..
 git clone --depth=1 https://github.com/pulp/ansible-pulp.git
 if [ -n "$PULP_ROLES_PR_NUMBER" ]; then
   cd ansible-pulp
-  git fetch --depth=1 origin +refs/pull/$PULP_ROLES_PR_NUMBER/merge
-  git checkout FETCH_HEAD
+  git fetch --depth=1 origin pull/$PULP_ROLES_PR_NUMBER/head:$PULP_ROLES_PR_NUMBER
+  git checkout $PULP_ROLES_PR_NUMBER
   cd ..
 fi
 
 git clone --depth=1 https://github.com/pulp/pulp_rpm.git
 if [ -n "$PULP_RPM_PR_NUMBER" ]; then
   cd pulp_rpm
-  git fetch --depth=1 origin +refs/pull/$PULP_RPM_PR_NUMBER/merge
-  git checkout FETCH_HEAD
+  git fetch --depth=1 origin pull/$PULP_RPM_PR_NUMBER/head:$PULP_RPM_PR_NUMBER
+  git checkout $PULP_RPM_PR_NUMBER
   cd ..
 fi
 
 
 git clone --depth=1 https://github.com/pulp/pulp_file.git
 if [ -n "$PULP_FILE_PR_NUMBER" ]; then
   cd pulp_file
-  git fetch --depth=1 origin +refs/pull/$PULP_FILE_PR_NUMBER/merge
-  git checkout FETCH_HEAD
+  git fetch --depth=1 origin pull/$PULP_FILE_PR_NUMBER/head:$PULP_FILE_PR_NUMBER
+  git checkout $PULP_FILE_PR_NUMBER
   cd ..
 fi
 
 
 git clone --depth=1 https://github.com/pulp/pulp-operator.git
 if [ -n "$PULP_OPERATOR_PR_NUMBER" ]; then
   cd pulp-operator
-  git fetch --depth=1 origin +refs/pull/$PULP_OPERATOR_PR_NUMBER/merge
-  git checkout FETCH_HEAD
+  git fetch --depth=1 origin pull/$PULP_OPERATOR_PR_NUMBER/head:$PULP_OPERATOR_PR_NUMBER
+  git checkout $PULP_OPERATOR_PR_NUMBER
   RELEASE_VERSION=v0.9.0
   curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu
   chmod +x operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu && sudo mkdir -p /usr/local/bin/ && sudo cp operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu /usr/local/bin/operator-sdk && rm operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu
@@ -88,8 +88,8 @@ git clone --depth=1 https://github.com/pulp/pulpcore.git --branch master
 
 if [ -n "$PULP_PR_NUMBER" ]; then
   cd pulpcore
-  git fetch --depth=1 origin +refs/pull/$PULP_PR_NUMBER/merge
-  git checkout FETCH_HEAD
+  git fetch --depth=1 origin pull/$PULP_PR_NUMBER/head:$PULP_PR_NUMBER
+  git checkout $PULP_PR_NUMBER
   cd ..
 fi
 

.travis/pre_before_install.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -euv
+
+if [[ $TOXENV == *"upgrade"* ]]; then
+  docker pull quay.io/pulp/pulp-ci-c7:3.0.0
+  docker pull quay.io/pulp/pulp-ci-dbuster:3.0.0
+  docker pull quay.io/pulp/pulp-ci-f31:3.0.0
+fi