From 630e9de658e96a592f319831f66c2fdec4cbeb09 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Fri, 13 Dec 2024 03:52:26 +0100 Subject: [PATCH] CI: drop special casing for Opensuse and CoreOS (#11791) - special casing should be in Kubespray, not in the test. It makes no sense to do something in tests which won't be done in actual usage. - We don't actually test CoreOS at all in the CI. --- tests/scripts/testcases_run.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tests/scripts/testcases_run.sh b/tests/scripts/testcases_run.sh index 6d70b465a1a..87792c23bda 100755 --- a/tests/scripts/testcases_run.sh +++ b/tests/scripts/testcases_run.sh @@ -31,21 +31,6 @@ export ANSIBLE_INVENTORY=${CI_PROJECT_DIR}/inventory/sample/ make -C tests INVENTORY_DIR=${ANSIBLE_INVENTORY} create-${CI_PLATFORM} -s ansible-playbook tests/cloud_playbooks/wait-for-ssh.yml -# Flatcar Container Linux needs auto update disabled -if [[ "$CI_JOB_NAME" =~ "coreos" ]]; then - ansible all -m raw -a 'systemctl disable locksmithd' - ansible all -m raw -a 'systemctl stop locksmithd' - mkdir -p /opt/bin && ln -s /usr/bin/python /opt/bin/python -fi - -if [[ "$CI_JOB_NAME" =~ "opensuse" ]]; then - # OpenSUSE needs netconfig update to get correct resolv.conf - # See https://goinggnu.wordpress.com/2013/10/14/how-to-fix-the-dns-in-opensuse-13-1/ - ansible all -m raw -a 'netconfig update -f' - # Auto import repo keys - ansible all -m raw -a 'zypper --gpg-auto-import-keys refresh' -fi - run_playbook () { playbook=$1 shift