Simplify keystone OSA upgrade job config

The keystone OSA rolling-upgrade job defines a
builder and job template which duplicates things
done elsewhere. Instead of duplicating job
config, this patch implements the re-use of
other job config.

This also ensures that the primary checkout for
all openstack-ansible scenario jobs is actually
the openstack-ansible repository, instead of
another repository (eg: dragonflow). This ensures
that the correct tests are activated.

Change-Id: I8b0147454ba3ee1ecbd23a6f7c019826690936eb

jenkins/jobs/ansible-role-jobs.yaml

@@ -75,7 +75,11 @@
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - zuul-git-prep-upper-constraints
+      # The test executes against a repo which understand how to translate
+      # ZUUL_CHANGES into the correct setup. The only thing we need to
+      # bootstrap here is the Ansible repo itself.
+      - zuul-git-prep-upper-constraints-cross:
+          project: openstack/{name}
       - shell: |
           # NOTE(mhayden): The CentOS CI image has many repositories enabled by
           # default that can cause package conflicts. We must disable all of

jenkins/jobs/keystone.yaml

@@ -155,62 +155,6 @@
       - devstack-logs
       - console-log
 
-- builder:
-    name: openstack-ansible-os_keystone-checkout
-    builders:
-      - shell: |
-          #!/bin/bash -xe
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              rm -f $CLONEMAP
-              rm -rf $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: openstack/openstack-ansible-os_keystone
-              dest: .
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
-              --cache-dir /opt/git git://git.openstack.org \
-              openstack/openstack-ansible-os_keystone \
-              openstack/requirements
-          cp $REQS_DIR/upper-constraints.txt ./
-
-- job-template:
-    name: '{pipeline}-keystone-osa-rolling-upgrade-{node-release}{suffix}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - openstack-ansible-os_keystone-checkout
-      - shell: |
-          # We dont need to use zuul-cloner to checkout keystone itself, as OpenStack-Ansible
-          # will default to using zuul-cloner to checkout Keystone.
-          # Allow Jenkins user to ssh into localhost
-          ssh-keygen -f ~/.ssh/id_rsa -N ""
-          cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-          ssh-keyscan localhost >> ~/.ssh/known_hosts
-          ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
-      - shell: |
-          /usr/local/jenkins/slave_scripts/run-tox.sh upgrade
-
-    publishers:
-      # Even though this isn't a devstack job, capturing the logs can still be
-      # useful.
-      - devstack-logs
-      - test-results
-      - console-log
-
 - job-template:
     name: '{pipeline}-keystone-dsvm-functional-ldap-domain-specific-driver-{node}{suffix}'
     node: '{node}'

jenkins/jobs/projects.yaml

@@ -4177,12 +4177,6 @@
           node: ubuntu-xenial-2-node
           node-release: ubuntu-xenial
       - periodic-python-jobs-with-oslo-master
-      - '{pipeline}-keystone-osa-rolling-upgrade-{node-release}{suffix}':
-          pipeline: gate
-          suffix: '-nv'
-          node: ubuntu-xenial-2-node
-          branch-override: default
-          node-release: ubuntu-xenial
       - '{pipeline}-keystone-dsvm-functional-ldap-domain-specific-driver-{node}{suffix}':
           pipeline: gate
           suffix: '-nv'

zuul/layout.yaml

@@ -11032,7 +11032,7 @@ projects:
       - gate-rally-dsvm-keystone-ubuntu-xenial-nv
       - gate-keystone-tox-patch_cover-ubuntu-xenial
       - gate-keystone-dsvm-grenade-multinode-ubuntu-xenial-nv
-      - gate-keystone-osa-rolling-upgrade-ubuntu-xenial-nv
+      - gate-openstack-ansible-os_keystone-ansible-upgrade-ubuntu-xenial-nv
       - gate-keystone-dsvm-functional-ldap-domain-specific-driver-ubuntu-xenial-nv
 
   - name: openstack/keystone-specs