From 4b6eb7c0b1d628d736f8ee851746241d86b0abd4 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 25 May 2017 11:07:07 +0100 Subject: [PATCH] Revert "Use a custom git checkout in developer mode" We are adding a more generic approach to setting up developer mode for testing, in I774343234a25063eb320cac85ba696d908f0a416. This will revert the initial POC work that was done on the Keystone role, in favour of the more generic approach. This reverts commit c8631347e729f9a21ec4f94f1a001776645dde5e. Change-Id: I62d62e24123bae7b59deb6f0508608fdc1472481 --- tests/group_vars/keystone_all.yml | 18 ------------------ tests/os_keystone-overrides.yml | 4 ---- tests/test-clone-repo.yml | 27 --------------------------- tests/test-upgrade-post.yml | 3 --- tests/test-upgrade-pre.yml | 5 ----- tests/test.yml | 6 ------ 6 files changed, 63 deletions(-) delete mode 100644 tests/group_vars/keystone_all.yml delete mode 100644 tests/test-clone-repo.yml diff --git a/tests/group_vars/keystone_all.yml b/tests/group_vars/keystone_all.yml deleted file mode 100644 index 5c96c43b..00000000 --- a/tests/group_vars/keystone_all.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -lxc_container_bind_mounts: - - host_directory: "{{ keystone_dev_local_directory | default('/opt/keystone') }}" - container_directory: "/opt/keystone" diff --git a/tests/os_keystone-overrides.yml b/tests/os_keystone-overrides.yml index 4b68f70d..0c8dfae0 100644 --- a/tests/os_keystone-overrides.yml +++ b/tests/os_keystone-overrides.yml @@ -16,10 +16,6 @@ # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens -keystone_git_repo: "file:///opt/keystone" -keystone_dev_clone_repo: "https://git.openstack.org/openstack/keystone" -keystone_dev_force_clone: False - tempest_run: yes tempest_plugins: diff --git a/tests/test-clone-repo.yml b/tests/test-clone-repo.yml deleted file mode 100644 index d5a3e800..00000000 --- a/tests/test-clone-repo.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -# Copyright 2017, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Clone keystone repository if it doesn't exist - hosts: localhost - user: root - become: true - pre_tasks: - - name: Clone the repo - git: - repo: "{{ keystone_dev_clone_repo }}" - dest: "{{ keystone_dev_local_directory | default('/opt/keystone') }}" - version: "{{ keystone_dev_git_branch | default('master') }}" - register: git_clone - until: git_clone|success diff --git a/tests/test-upgrade-post.yml b/tests/test-upgrade-post.yml index 16a149d9..71af132c 100644 --- a/tests/test-upgrade-post.yml +++ b/tests/test-upgrade-post.yml @@ -19,9 +19,6 @@ # Install upgrade benchmarking - include: test-benchmark-keystone-upgrade.yml -# Update repo -- include: test-clone-repo.yml - # Install Keystone - include: common/test-install-keystone.yml diff --git a/tests/test-upgrade-pre.yml b/tests/test-upgrade-pre.yml index b0b96a0f..76c36eea 100644 --- a/tests/test-upgrade-pre.yml +++ b/tests/test-upgrade-pre.yml @@ -22,11 +22,6 @@ # Prepare the host - include: common/test-prepare-host.yml -# Clone the repo -- include: test-clone-repo.yml - vars: - keystone_dev_git_branch: "stable/ocata" - # Prepare the containers - include: common/test-prepare-containers.yml diff --git a/tests/test.yml b/tests/test.yml index fdff1af6..d506503d 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -19,12 +19,6 @@ # Prepare the host - include: common/test-prepare-host.yml -# Clone repository -- include: test-clone-repo.yml - when: > - keystone_dev_local_directory is not defined or - keystone_dev_force_clone - # Prepare the containers - include: common/test-prepare-containers.yml