From 8f55c68d8371a50625c3fdb5b82cbeb62f2808c4 Mon Sep 17 00:00:00 2001 From: Logan V Date: Sat, 11 May 2019 00:18:14 -0500 Subject: [PATCH] Use integrated repo for nova-lxd job Depends-On: I8ec359f5c65c957064a39b75b9c3ea3d3a9d9e89 Depends-On: I2d49b6802d8cf99f6d7ac74ae4ce0ab8f6d1c7a5 Depends-On: I0e77423a1f28d9a53215ae68c1f9f3e2af00f340 Depends-On: I621660f39c4e51db4b8063feee782aae5cd16840 Change-Id: I01df855d8b9255d24efe16ab053ffa491fda351f --- tests/test-create-zfs-dev.yml | 4 +-- zuul.d/jobs.yaml | 8 +++--- .../playbooks/files/user_variables_lxd.yml | 0 zuul.d/playbooks/pre-lxd.yml | 27 +++++++++++++++++++ zuul.d/project.yaml | 4 +-- 5 files changed, 34 insertions(+), 9 deletions(-) rename tests/os_nova-overrides-lxd.yml => zuul.d/playbooks/files/user_variables_lxd.yml (100%) create mode 100644 zuul.d/playbooks/pre-lxd.yml diff --git a/tests/test-create-zfs-dev.yml b/tests/test-create-zfs-dev.yml index cc0ed0cc..cbae1499 100644 --- a/tests/test-create-zfs-dev.yml +++ b/tests/test-create-zfs-dev.yml @@ -14,10 +14,8 @@ # limitations under the License. - name: Configure ZFS backing storage - hosts: localhost + hosts: nova_compute user: root - become: true - connection: local tasks: - block: - name: Install ZFS packages diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 72380d89..cd5a71e7 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -14,7 +14,7 @@ # limitations under the License. - job: - name: openstack-ansible-lxd-ubuntu-bionic - parent: openstack-ansible-functional-ubuntu-bionic - vars: - tox_env: lxd + name: openstack-ansible-deploy-aio_metal_lxd-ubuntu-bionic + parent: openstack-ansible-deploy-aio_metal-ubuntu-bionic + pre-run: + - zuul.d/playbooks/pre-lxd.yml diff --git a/tests/os_nova-overrides-lxd.yml b/zuul.d/playbooks/files/user_variables_lxd.yml similarity index 100% rename from tests/os_nova-overrides-lxd.yml rename to zuul.d/playbooks/files/user_variables_lxd.yml diff --git a/zuul.d/playbooks/pre-lxd.yml b/zuul.d/playbooks/pre-lxd.yml new file mode 100644 index 00000000..7395f201 --- /dev/null +++ b/zuul.d/playbooks/pre-lxd.yml @@ -0,0 +1,27 @@ +--- +# Copyright 2019, Logan Vig +# +# 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. + +- hosts: all[0] + become: yes + tasks: + - name: Run the LXD ZFS bootstrap + command: openstack-ansible tests/test-create-zfs-dev.yml + args: + chdir: "src/opendev.org/openstack/openstack-ansible-os_nova" + + - name: Drop the LXD variable overrides + copy: + src: user_variables_lxd.yml + dest: /etc/openstack_deploy/user_variables_lxd.yml diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 5bbce164..b1532cbf 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -23,7 +23,7 @@ - release-notes-jobs-python3 check: jobs: - - openstack-ansible-lxd-ubuntu-bionic + - openstack-ansible-deploy-aio_metal_lxd-ubuntu-bionic gate: jobs: - - openstack-ansible-lxd-ubuntu-bionic + - openstack-ansible-deploy-aio_metal_lxd-ubuntu-bionic