Add non-containerized Python 3.6 gate

Patch also changes the way we run kuryr-controller in the DevStack
plugin by removing the scripts/run_server.py and using the Python
executable in the system directly.

Implements: blueprint goal-python36

Change-Id: I1e1c62023b6018bf49163be12fdca5b42d5f46d6
This commit is contained in:
Michał Dulko 2018-09-12 14:03:50 -06:00
parent 7a8bd050c1
commit 8a38f84dd7
5 changed files with 17 additions and 20 deletions

View File

@ -61,6 +61,15 @@
devstack_services:
kuryr-daemon: true
- job:
name: kuryr-kubernetes-tempest-daemon-octavia-py36
parent: kuryr-kubernetes-tempest-daemon-octavia
description: |
Tempest with Octavia, CNI daemon with DevStack running on Python 3.6
vars:
devstack_localrc:
USE_PYTHON3: true
- job:
name: kuryr-kubernetes-tempest-daemon-containerized-octavia
parent: kuryr-kubernetes-tempest-daemon-octavia

View File

@ -48,6 +48,7 @@
- kuryr-kubernetes-tempest-daemon-containerized-octavia-l2
- kuryr-kubernetes-tempest-daemon-containerized-octavia-namespace
- kuryr-kubernetes-tempest-daemon-containerized-octavia-network-policy
- kuryr-kubernetes-tempest-daemon-octavia-py36
- kuryr-kubernetes-tempest-daemon-containerized-octavia-py36
- kuryr-kubernetes-tempest-daemon-containerized-openshift-octavia-serial
- kuryr-kubernetes-tempest-daemon-ovn

View File

@ -724,9 +724,8 @@ function run_kuryr_kubernetes {
"${KURYR_HYPERKUBE_DATA_DIR}/kuryr-ca.crt" 1200
fi
run_process kuryr-kubernetes \
"$python_bin ${KURYR_HOME}/scripts/run_server.py \
--config-file $KURYR_CONFIG"
local controller_bin=$(which kuryr-k8s-controller)
run_process kuryr-kubernetes "$controller_bin --config-file $KURYR_CONFIG"
}

View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The scripts/run_server.py scripts gets removed as we no longer use it in
DevStack plugin.

View File

@ -1,17 +0,0 @@
#!/usr/bin/env python
#
# 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.
from kuryr_kubernetes.cmd.eventlet import controller
controller.start()