Re-organize the gaterc files to prevent errors

All common configuration was set to common files for the specific ones to consume. This allows us to put only the differing configuration, and keep the common stuff together, and in this way avoid mistakes (e.g. having selective-proactive on only for etcd/zmq). Change-Id: Iace7b9116aefbf169245d42ef5ad04525cd72a33 Related-Bug: #1737889
2017-12-21 11:05:52 +02:00 · 2017-12-21 11:05:52 +02:00 · 5c63080846
parent 35c9de51d9
commit 5c63080846
12 changed files with 141 additions and 39 deletions
--- a/devstack/devstackgaterc-common
+++ b/devstack/devstackgaterc-common
@ -0,0 +1,24 @@
+# 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.
+
+#
+# This script is executed in the OpenStack CI job that runs DevStack + tempest.
+# It is also used by the rally job. You can find the CI job configuration here:
+#
+# https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
+#
+
+export OVERRIDE_ENABLED_SERVICES=key,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,rabbit,mysql,dstat,df-controller,q-svc,df-metadata,q-qos,placement-api,q-trunk
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_RUNNING_IN_GATE=True"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"EXTERNAL_HOST_IP=172.24.4.100"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_INSTALL_FROM_GIT=True"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_BRANCH=v2.7.1"
--- a/devstack/devstackgaterc-etcd-zmq
+++ b/devstack/devstackgaterc-etcd-zmq
@ -17,19 +17,5 @@
 # https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
 #

-export OVERRIDE_ENABLED_SERVICES=key,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,rabbit,mysql,dstat,df-controller,df-etcd,etcd3,df-zmq-publisher-service,q-svc,df-metadata,q-qos,placement-api,q-trunk
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_PUB_SUB=True"
+export OVERRIDE_ENABLED_SERVICES+=,df-etcd,etcd3,df-zmq-publisher-service
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_ACTIVE_DETECTION=False"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_RUNNING_IN_GATE=True"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"EXTERNAL_HOST_IP=172.24.4.100"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_DF_SFC=True"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_INSTALL_FROM_GIT=True"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_BRANCH=v2.7.1"
-
-if [ -n "${DEVSTACK_GATE_TEMPEST}" ] && [ ${DEVSTACK_GATE_TEMPEST} -gt 0 ]; then
-    # Only include tempest if this is a tempest job
-    export OVERRIDE_ENABLED_SERVICES=${OVERRIDE_ENABLED_SERVICES},tempest
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=True"
-else
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=False"
-fi
--- a/devstack/devstackgaterc-fullstack-common
+++ b/devstack/devstackgaterc-fullstack-common
@ -0,0 +1,21 @@
+# 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.
+
+#
+# This script is executed in the OpenStack CI job that runs DevStack + tempest.
+# It is also used by the rally job. You can find the CI job configuration here:
+#
+# https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
+#
+
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_DF_SFC=True"
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=False"
--- a/devstack/devstackgaterc-fullstack-etcd-zmq
+++ b/devstack/devstackgaterc-fullstack-etcd-zmq
@ -0,0 +1,22 @@
+# 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.
+
+#
+# This script is executed in the OpenStack CI job that runs DevStack + tempest.
+# It is also used by the rally job. You can find the CI job configuration here:
+#
+# https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
+#
+
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-common
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-fullstack-common
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-etcd-zmq
--- a/devstack/devstackgaterc-fullstack-redis
+++ b/devstack/devstackgaterc-fullstack-redis
@ -0,0 +1,22 @@
+# 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.
+
+#
+# This script is executed in the OpenStack CI job that runs DevStack + tempest.
+# It is also used by the rally job. You can find the CI job configuration here:
+#
+# https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
+#
+
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-common
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-fullstack-common
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-redis
--- a/devstack/devstackgaterc-rally-redis
+++ b/devstack/devstackgaterc-rally-redis
@ -0,0 +1,22 @@
+# 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.
+
+#
+# This script is executed in the OpenStack CI job that runs DevStack + tempest.
+# It is also used by the rally job. You can find the CI job configuration here:
+#
+# https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
+#
+
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-common
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-redis
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=False"
--- a/devstack/devstackgaterc-redis
+++ b/devstack/devstackgaterc-redis
@ -14,26 +14,8 @@
 # This script is executed in the OpenStack CI job that runs DevStack + tempest.
 # It is also used by the rally job. You can find the CI job configuration here:
 #
-# http://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
+# https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
 #

-export OVERRIDE_ENABLED_SERVICES=key,n-api,n-api-meta,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,rabbit,mysql,dstat,df-controller,df-redis,df-redis-server,q-svc,df-metadata,q-qos,placement-api,df-bgp,q-trunk
+export OVERRIDE_ENABLED_SERVICES+=,df-redis,df-redis-server
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_REDIS_PUBSUB=True"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_RUNNING_IN_GATE=True"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"EXTERNAL_HOST_IP=172.24.4.100"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_INSTALL_FROM_GIT=True"
-export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_BRANCH=v2.7.1"
-
-if [ -n "${DEVSTACK_GATE_TEMPEST}" ] && [ ${DEVSTACK_GATE_TEMPEST} -gt 0 ]; then
-    # Only include tempest if this is a tempest job
-    export OVERRIDE_ENABLED_SERVICES=${OVERRIDE_ENABLED_SERVICES},tempest
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=True"
-    source /opt/stack/new/dragonflow/devstack/tempest-filter
-else
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=False"
-
-    # Enable SFC only in fullstack job
-    if [[ "${PROJECTS}" != *"openstack/rally"* ]]; then
-        export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_DF_SFC=True"
-    fi
-fi
--- a/devstack/devstackgaterc-tempest-redis
+++ b/devstack/devstackgaterc-tempest-redis
@ -0,0 +1,23 @@
+# 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.
+
+#
+# This script is executed in the OpenStack CI job that runs DevStack + tempest.
+# It is also used by the rally job. You can find the CI job configuration here:
+#
+# https://git.openstack.org/cgit/openstack-infra/project-config/tree/jenkins/jobs/dragonflow.yaml
+#
+
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-common
+source /opt/stack/new/dragonflow/devstack/devstackgaterc-redis
+source /opt/stack/new/dragonflow/devstack/tempest-filter
+export DEVSTACK_LOCAL_CONFIG+=$'\n'"NEUTRON_CREATE_INITIAL_NETWORKS=True"
--- a/zuul/dragonflow-dsvm-fullstack-etcd-zmq/run.yaml
+++ b/zuul/dragonflow-dsvm-fullstack-etcd-zmq/run.yaml
@ -57,7 +57,7 @@
          export PROJECTS="openstack/dragonflow $PROJECTS"
          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
          export PROJECTS="openstack/networking-sfc $PROJECTS"
-          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-etcd-zmq
+          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-fullstack-etcd-zmq

          function gate_hook {
              bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/gate_hook.sh fullstack
--- a/zuul/dragonflow-dsvm-fullstack-redis/run.yaml
+++ b/zuul/dragonflow-dsvm-fullstack-redis/run.yaml
@ -61,7 +61,7 @@
          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
          export PROJECTS="openstack/networking-sfc $PROJECTS"

-          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-redis
+          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-fullstack-redis

          function gate_hook {
              bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/gate_hook.sh fullstack
--- a/zuul/dragonflow-dsvm-rally/run.yaml
+++ b/zuul/dragonflow-dsvm-rally/run.yaml
@ -54,7 +54,7 @@
          export PROJECTS="openstack/neutron-dynamic-routing $PROJECTS"
          export PROJECTS="openstack/rally $PROJECTS"

-          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-redis
+          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-rally-redis

          function post_test_hook {
              $BASE/new/rally/tests/ci/rally-gate.sh
--- a/zuul/tempest-dsvm-dragonflow/run.yaml
+++ b/zuul/tempest-dsvm-dragonflow/run.yaml
@ -63,7 +63,7 @@
          # Keep localrc to be able to set some vars in pre_test_hook
          export KEEP_LOCALRC=1

-          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-redis
+          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc-tempest-redis

          function gate_hook {
              bash -xe $BASE/new/dragonflow/dragonflow/tests/contrib/gate_hook.sh tempest