Update various vars/scripts for Pike

The tempest SHA is set to match the current tempest pin
in the integrated repo.

Change-Id: Ifbbe569b5b12e820b402cf66c16ab01af09331eb

.gitreview

@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/openstack-ansible-tests.git
+defaultbranch=stable/pike

run_tests.sh

@@ -56,7 +56,7 @@ git_clone_repo() {
         if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
             ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
         else
-            git clone \
+            git clone -b stable/pike \
                 https://git.openstack.org/openstack/openstack-ansible-tests \
                 tests/common
         fi

sync-test-repos.sh

@@ -160,7 +160,7 @@ mkdir ${tempdir}
 pushd ${tempdir} &> /dev/null
 
 echo "=> Cloning openstack-ansible-tests repository"
-eval git clone ${openstack_git_url}/openstack/openstack-ansible-tests
+eval git clone -b stable/pike ${openstack_git_url}/openstack/openstack-ansible-tests
 echo -e "\n---------------------------------------------\n"
 
 for proj in ${osa_projects[@]}; do
@@ -170,7 +170,7 @@ for proj in ${osa_projects[@]}; do
     check_and_ignore ${proj_dir} && continue
 
     echo "=> ##### ${proj} #####"
-    eval git clone ${openstack_git_url}/$proj
+    eval git clone -b stable/pike ${openstack_git_url}/$proj
 
     pushd $proj_dir &> /dev/null
 

test-ansible-env-prep.sh

@@ -121,7 +121,7 @@ else
         if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-plugins" ]]; then
             ln -s ${WORKING_DIR} "${ANSIBLE_PLUGIN_DIR}"
         else
-            git clone \
+            git clone -b stable/pike \
                 https://git.openstack.org/openstack/openstack-ansible-plugins \
                 "${ANSIBLE_PLUGIN_DIR}"
         fi
@@ -133,7 +133,7 @@ else
         if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-ops" ]]; then
             ln -s ${WORKING_DIR} "${OSA_OPS_DIR}"
         else
-            git clone \
+            git clone -b stable/pike \
                 https://git.openstack.org/openstack/openstack-ansible-ops \
                 "${OSA_OPS_DIR}"
         fi

test-vars.yml

@@ -18,7 +18,7 @@
 external_lb_vip_address: 127.0.0.1
 internal_lb_vip_address: 127.0.0.1
 debug: true
-test_branch: master
+test_branch: stable/pike
 
 ## Container destruction when testing repeatedly
 force_containers_destroy: True
@@ -159,7 +159,7 @@ nova_container_mysql_password: "SuperSecrete"
 nova_developer_mode: true
 nova_galera_address: "{{ test_galera_host }}"
 nova_galera_database: nova
-nova_git_install_branch: master
+nova_git_install_branch: "{{ test_branch }}"
 nova_keystone_auth_plugin: password
 nova_management_address: "{{ ansible_host }}"
 nova_metadata_port: 8775
@@ -411,7 +411,7 @@ horizon_external_ssl: False
 
 # Tempest specific settings
 tempest_developer_mode: True
-tempest_git_install_branch: "{{ test_branch }}"
+tempest_git_install_branch: e56964dfbe6bca0c3acee7891111d9e12d0cc4e2
 tempest_venv_tag: "{{ tempest_git_install_branch }}"
 # tempest_venv_bin is the same as the default in os_tempest role, but we set
 # it again here so we can refer to it in test-nova-functional.yml

tests/ansible-role-requirements.yml

@@ -1,48 +1,48 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: stable/pike
 - name: pip_install
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   scm: git
-  version: master
+  version: stable/pike
 - name: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
-  version: master
+  version: stable/pike
 - name: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: stable/pike
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git
-  version: master
+  version: stable/pike
 - name: lxc_container_create
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
-  version: master
+  version: stable/pike
 - name: galera_client
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
   scm: git
-  version: master
+  version: stable/pike
 - name: galera_server
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
   scm: git
-  version: master
+  version: stable/pike
 - name: rabbitmq_server
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
-  version: master
+  version: stable/pike
 - name: os_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   scm: git
-  version: master
+  version: stable/pike
 - name: openstack_openrc
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git
-  version: master
+  version: stable/pike
 - name: os_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
-  version: master
+  version: stable/pike

tests/tests-repo-clone.sh

@@ -78,7 +78,7 @@ elif [[ ! -d tests/common ]]; then
     if [[ "$(basename ${WORKING_DIR})" == "openstack-ansible-tests" ]]; then
         ln -s ${WORKING_DIR} ${WORKING_DIR}/tests/common
     else
-        git clone \
+        git clone -b stable/pike \
             https://git.openstack.org/openstack/openstack-ansible-tests \
             ${WORKING_DIR}/tests/common
     fi
@@ -92,7 +92,7 @@ fi
 # tests repo are not supported.
 if [[ "${CLONE_UPGRADE_TESTS}" == "yes" ]]; then
     if [[ ! -d "${WORKING_DIR}/tests/common/previous" ]]; then
-        git clone -b stable/ocata \
+        git clone -b stable/pike \
             https://git.openstack.org/openstack/openstack-ansible-tests \
             ${WORKING_DIR}/tests/common/previous
   fi

tox.ini

@@ -7,7 +7,7 @@ envlist = docs,linters,functional
 [testenv]
 usedevelop = True
 install_command =
-    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
 deps =
     -r{toxinidir}/test-requirements.txt
 commands =
@@ -78,11 +78,11 @@ commands =
 # The value for other repositories must be:
 # http://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt
 # or for a stable branch:
-# http://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/newton
+# http://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/pike
 [testenv:ansible]
 deps =
     {[testenv]deps}
-    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt
+    -rhttps://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h=stable/pike
     -r{toxinidir}/test-ansible-deps.txt