From bd2f9a2910e4615dee1f0027e8441490e9574b6b Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Mon, 10 Dec 2018 09:19:36 +0100
Subject: [PATCH] Configure DevStack job

Change-Id: Ic0e1b37b48987a8a254d3f30adfb47f282e95ade
---
 devstack/README.rst  | 21 +++++++++++++++++++++
 devstack/plugin.sh   | 28 ++++++++++++++++++++++++++++
 devstack/settings    |  3 +++
 zuul.d/devstack.yaml | 25 ++++++++++++++++++-------
 4 files changed, 70 insertions(+), 7 deletions(-)
 create mode 100644 devstack/README.rst
 create mode 100644 devstack/plugin.sh
 create mode 100644 devstack/settings

diff --git a/devstack/README.rst b/devstack/README.rst
new file mode 100644
index 000000000..11db3b7ee
--- /dev/null
+++ b/devstack/README.rst
@@ -0,0 +1,21 @@
+====================
+Enabling in Devstack
+====================
+
+**WARNING**: the stack.sh script must be run in a disposable VM that is not
+being created automatically, see the README.md file in the "devstack"
+repository.  See contrib/vagrant to create a vagrant VM.
+
+1. Download DevStack::
+
+    git clone https://git.openstack.org/openstack-dev/devstack.git
+    cd devstack
+
+2. Add this repo as an external repository::
+
+     > cat local.conf
+     [[local|localrc]]
+     enable_plugin tobiko https://git.openstack.org/openstack/tobiko
+
+3. Run ``stack.sh``
+
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
new file mode 100644
index 000000000..a8a6b7b23
--- /dev/null
+++ b/devstack/plugin.sh
@@ -0,0 +1,28 @@
+# Directory where this plugin.sh file is
+TOBIKO_PLUGIN_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+
+# source "${TOBIKO_PLUGIN_DIR}/customize_image.sh"
+
+
+function tobiko_install {
+    setup_dev_lib "tobiko"
+}
+
+
+function tobiko_test_config {
+    echo "TODO(fressi): generate tobiko.conf here"
+}
+
+
+if [[ "$1" == "stack" ]]; then
+    case "$2" in
+        install)
+            echo_summary "Installing tobiko-plugin"
+            tobiko_install
+            ;;
+        test-config)
+            echo_summary "Configuring tobiko options"
+            tobiko_test_config
+            ;;
+    esac
+fi
diff --git a/devstack/settings b/devstack/settings
new file mode 100644
index 000000000..10939a66c
--- /dev/null
+++ b/devstack/settings
@@ -0,0 +1,3 @@
+GITREPO["tobiko"]=${TOBIKO_REPO:-${GIT_BASE}/openstack/tobiko.git}
+GITDIR["tobiko"]=$DEST/tobiko
+GITBRANCH["tobiko"]=master
diff --git a/zuul.d/devstack.yaml b/zuul.d/devstack.yaml
index 274a0e638..0faf9c3f7 100644
--- a/zuul.d/devstack.yaml
+++ b/zuul.d/devstack.yaml
@@ -10,12 +10,24 @@
       test setup. To run a multi-node test inherit from tobiko-devstack and
       set the nodeset to a multi-node one.
     required-projects:
-      - git.openstack.org/openstack/tobiko
+      - openstack-infra/devstack-gate
+      - openstack/neutron
+      - openstack/tobiko
     timeout: 7200
-    roles:
-      - zuul: git.openstack.org/openstack-dev/devstack
     vars:
+      devstack_localrc:
+        USE_PYTHON3: true
+        NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-mac-address-regenerate,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details,uplink-status-propagation
+      devstack_plugins:
+        neutron: git://git.openstack.org/openstack/neutron.git
+        tobiko: git://git.openstack.org/openstack/tobiko.git
       devstack_services:
+        tls-proxy: false
+        neutron-dns: true
+        neutron-qos: true
+        neutron-segments: true
+        neutron-trunk: true
+        neutron-uplink-status-propagation: true
         tempest: false
       devstack_local_conf:
         test-config:
@@ -24,9 +36,9 @@
               min_compute_nodes: "{{ groups['compute'] | default(['controller']) | length }}"
       test_results_stage_name: test_results
       zuul_copy_output:
-        '{{ devstack_base_dir }}/tempest/etc/tempest.conf': logs
-        '{{ devstack_base_dir }}/tempest/etc/accounts.yaml': logs
-        '{{ devstack_base_dir }}/tempest/tempest.log': logs
+        '{{ devstack_base_dir }}/tobiko/etc/tobiko.conf': logs
+        '{{ devstack_base_dir }}/tobiko/etc/accounts.yaml': logs
+        '{{ devstack_base_dir }}/tobiko/tobiko.log': logs
         '{{ stage_dir }}/{{ test_results_stage_name }}.subunit': logs
         '{{ stage_dir }}/{{ test_results_stage_name }}.html': logs
         '{{ stage_dir }}/stackviz': logs
@@ -52,6 +64,5 @@
       Integration test that runs all tests against DevStack provided cloud
     vars:
       tox_envlist: neutron
-      # tempest_test_regex: tempest
       devstack_localrc:
         ENABLE_FILE_INJECTION: true