Merge "Enable 2023.2 compute-kit-ovn job"

This commit is contained in:
Zuul 2024-01-04 21:03:27 +00:00 committed by Gerrit Code Review
commit 57a30e2317
6 changed files with 72 additions and 0 deletions

View File

@ -31,6 +31,8 @@ kubectl label --overwrite nodes --all ceph-mgr=enabled
# and we don't need L2 overlay (will be implemented later).
kubectl label --overwrite nodes -l "node-role.kubernetes.io/control-plane" l3-agent=enabled
kubectl label --overwrite nodes -l "node-role.kubernetes.io/control-plane" openstack-network-node=enabled
for NAMESPACE in ceph openstack osh-infra; do
tee /tmp/${NAMESPACE}-ns.yaml << EOF
apiVersion: v1

View File

@ -13,6 +13,21 @@
# under the License.
set -xe
# By default we set enable-chassis-as-gw on all OVN controllers which means
# all nodes are connected to the provider network, but for test environment this is not
# the case.
if [[ "$FEATURE_GATES" =~ (,|^)ovn(,|$) ]]; then
HOSTNAME=$(hostname -f)
kubectl -n openstack get po --selector application=ovn,component=ovn-controller -o name | while read po; do
kubectl -n openstack exec $po -c controller -- bash -c "if [[ \$(hostname -f) != ${HOSTNAME} ]]; then ovs-vsctl set open . external-ids:ovn-cms-options=availability-zones=nova; fi"
done
fi
sleep 10
export OS_CLOUD=openstack_helm
openstack network agent list
openstack availability zone list --network
# Assign IP address to br-ex
: ${OSH_EXT_SUBNET:="172.24.4.0/24"}
: ${OSH_BR_EX_ADDR:="172.24.4.1/24"}

View File

@ -22,10 +22,26 @@ export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../open
#NOTE: Lint and package chart
make -C ${HELM_CHART_ROOT_PATH} ovn
tee /tmp/ovn.yaml << EOF
volume:
ovn_ovsdb_nb:
enabled: false
ovn_ovsdb_sb:
enabled: false
network:
interface:
tunnel: null
conf:
ovn_bridge_mappings: public:br-ex
auto_bridge_add:
br-ex: null
EOF
#NOTE: Deploy command
: ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install ovn ${HELM_CHART_ROOT_PATH}/ovn \
--namespace=openstack \
--values=/tmp/ovn.yaml \
${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_OVN}

View File

@ -52,6 +52,17 @@
container_distro_name: ubuntu
container_distro_version: jammy
- job:
name: openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy
parent: openstack-helm-compute-kit-ovn
nodeset: openstack-helm-3nodes-ubuntu_jammy
vars:
osh_params:
openstack_release: "2023.2"
container_distro_name: ubuntu
container_distro_version: jammy
feature_gates: ovn
- job:
name: openstack-helm-umbrella-2023-2-ubuntu_jammy
parent: openstack-helm-umbrella

View File

@ -90,6 +90,33 @@
- ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh
- job:
name: openstack-helm-compute-kit-ovn
parent: openstack-helm-deploy
abstract: true
vars:
gate_scripts:
- ./tools/deployment/common/prepare-k8s.sh
- ./tools/deployment/common/setup-client.sh
- ./tools/deployment/component/common/ingress.sh
- - ./tools/deployment/component/common/rabbitmq.sh
- ./tools/deployment/component/common/mariadb.sh
- ./tools/deployment/component/common/memcached.sh
- ./tools/deployment/component/keystone/keystone.sh
- - ./tools/deployment/component/heat/heat.sh
- export GLANCE_BACKEND=memory; ./tools/deployment/component/glance/glance.sh
- ./tools/deployment/component/compute-kit/openvswitch.sh
- ./tools/deployment/component/compute-kit/libvirt.sh
- ./tools/deployment/component/ovn/ovn.sh
- ./tools/deployment/component/compute-kit/compute-kit.sh
- export OSH_TEST_TIMEOUT=1200;./tools/deployment/common/run-helm-tests.sh neutron
- ./tools/deployment/common/run-helm-tests.sh nova
- ./tools/deployment/common/run-helm-tests.sh glance
- ./tools/deployment/common/run-helm-tests.sh keystone
- ./tools/deployment/common/setup-gateway.sh
- ./tools/deployment/common/use-it.sh
- ./tools/deployment/common/force-cronjob-run.sh
- job:
name: openstack-helm-keystone-ldap
parent: openstack-helm-deploy

View File

@ -43,6 +43,7 @@
- openstack-helm-compute-kit-2023-2-ubuntu_jammy # 3 nodes
- openstack-helm-tls-2023-2-ubuntu_jammy # 1 node 32GB
- openstack-helm-umbrella-2023-2-ubuntu_jammy # 1 node 32GB
- openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy # 3 nodes
gate:
jobs:
- openstack-helm-lint