Skip to content

Commit 765c0cc

Browse files
authored
Merge pull request #2812 from k8s-infra-cherrypick-robot/cherry-pick-2809-to-release-0.13
[release-0.13] 🌱 Migrate CI to stable/2025.2
2 parents e13466a + 4ee051b commit 765c0cc

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

hack/ci/cloud-init/controller.yaml.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Enable Logging
1111
LOGFILE=/opt/stack/logs/stack.sh.log
1212
VERBOSE=True
13-
LOG_COLOR=True
13+
LOG_COLOR=False
1414

1515
# Host tuning
1616
ENABLE_SYSCTL_MEM_TUNING="True"
@@ -44,7 +44,7 @@
4444
PUBLIC_BRIDGE_MTU=${MTU}
4545
ENABLE_CHASSIS_AS_GW="True"
4646
OVN_DBS_LOG_LEVEL="dbg"
47-
Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn,logger"
47+
Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn"
4848
OVN_L3_CREATE_PUBLIC_NETWORK="True"
4949
Q_AGENT="ovn"
5050

hack/ci/cloud-init/worker.yaml.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Enable Logging
1010
LOGFILE=/opt/stack/logs/stack.sh.log
1111
VERBOSE=True
12-
LOG_COLOR=True
12+
LOG_COLOR=False
1313

1414
# Host tuning
1515
ENABLE_SYSCTL_MEM_TUNING="True"
@@ -41,7 +41,7 @@
4141
PUBLIC_BRIDGE_MTU=${MTU}
4242
ENABLE_CHASSIS_AS_GW="False"
4343
OVN_DBS_LOG_LEVEL="dbg"
44-
Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn,logger"
44+
Q_ML2_PLUGIN_MECHANISM_DRIVERS="ovn"
4545
Q_AGENT="ovn"
4646

4747
# WORKAROUND:

hack/ci/create_devstack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"
3131

3232
CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"}
3333

34-
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2024.2"}
34+
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2025.2"}
3535
OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}
3636

3737
# Devstack will create a provider network using this range

0 commit comments

Comments
 (0)