PAPR: run upgrade from 3.9 branch

.papr.sh

@@ -27,10 +27,20 @@ git config --global user.name "OpenShift Atomic CI"
 # Rebase existing branch on the latest code locally, as PAPR running doesn't do merges
 git fetch origin ${target_branch_in} && git rebase origin/${target_branch_in}
 
-pip install -r requirements.txt
-
 PAPR_INVENTORY=${PAPR_INVENTORY:-.papr.inventory}
 PAPR_RUN_UPDATE=${PAPR_RUN_UPDATE:-0}
+PAPR_UPGRADE_FROM=${PAPR_UPGRADE_FROM:-0}
+PAPR_EXTRAVARS=""
+
+# Replace current branch with PAPR_UPGRADE_FROM
+if [[ "${PAPR_UPGRADE_FROM}" != "0" ]]; then
+  git branch new-code
+  git checkout release-${PAPR_UPGRADE_FROM}
+  git clean -fdx
+  PAPR_EXTRAVARS="-e openshift_release=${PAPR_UPGRADE_FROM}"
+fi
+
+pip install -r requirements.txt
 
 # Human-readable output
 export ANSIBLE_STDOUT_CALLBACK=debug
@@ -52,12 +62,18 @@ upload_journals() {
 trap upload_journals ERR
 
 # run the prerequisites play
-ansible-playbook -vvv -i $PAPR_INVENTORY playbooks/prerequisites.yml
+ansible-playbook -vvv -i $PAPR_INVENTORY $PAPR_EXTRAVARS playbooks/prerequisites.yml
 
 # run the actual installer
-ansible-playbook -vvv -i $PAPR_INVENTORY playbooks/deploy_cluster.yml
+ansible-playbook -vvv -i $PAPR_INVENTORY $PAPR_EXTRAVARS playbooks/deploy_cluster.yml
+
+# Restore the branch if needed
+if [[ "${PAPR_UPGRADE_FROM}" != "0" ]]; then
+  git checkout new-code
+  git clean -fdx
+fi
 
-# Run upgrade playbook (to a minor version)
+# Run upgrade playbook
 if [[ "${PAPR_RUN_UPDATE}" != "0" ]]; then
   update_version="$(echo $target_branch | sed 's/\./_/')"
   ansible-playbook -vvv -i $PAPR_INVENTORY playbooks/byo/openshift-cluster/upgrades/v${update_version}/upgrade.yml

.papr.yml

@@ -60,6 +60,22 @@ env:
 
 ---
 inherit: true
+context: 'fedora/27/atomic/upgrade_3.9'
+
+cluster:
+  hosts:
+    - name: ocp-master
+      distro: fedora/27/atomic
+      specs:
+        ram: 4096
+  container:
+    image: registry.fedoraproject.org/fedora:27
+env:
+  PAPR_INVENTORY: .papr.all-in-one.inventory
+  PAPR_UPGRADE_FROM: "3.9"
+  PAPR_RUN_UPDATE: "yes"
+---
+inherit: true
 context: 'fedora/27/atomic/master-ha'
 
 cluster: