From b4efe0582da49a07e0fb7a7238badedd8510026c Mon Sep 17 00:00:00 2001 From: Lucas Vargas Dias Date: Tue, 26 Nov 2024 13:25:09 -0300 Subject: [PATCH 1/5] Test action --- ovn_cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovn_cluster.sh b/ovn_cluster.sh index 762e66a..9aaa80e 100755 --- a/ovn_cluster.sh +++ b/ovn_cluster.sh @@ -819,7 +819,7 @@ EOF chmod 0755 ${FAKENODE_MNT_DIR}/create_ovn_res.sh # add ts transit switch. - ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-ic-nbctl ts-add ts1 + ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-ic-nbctl ts-add --may-exist ts1 # wait for ovn-ic to kick in while sleep 2; do ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-nbctl ls-list | grep -q ts1 && break From 970133deaeb056128b80847abe330bdd41be6684 Mon Sep 17 00:00:00 2001 From: Lucas Vargas Dias Date: Tue, 26 Nov 2024 13:39:40 -0300 Subject: [PATCH 2/5] Change order of skip-broken parameter --- image/cinc/install_fedora_pkg.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/image/cinc/install_fedora_pkg.sh b/image/cinc/install_fedora_pkg.sh index 4739a62..c7a14c7 100755 --- a/image/cinc/install_fedora_pkg.sh +++ b/image/cinc/install_fedora_pkg.sh @@ -16,7 +16,7 @@ systemctl mask \ systemd-udevd.service \ systemd-vconsole-setup.service -dnf -y --skip-broken install \ +dnf -y install \ autoconf \ automake \ conntrack-tools \ @@ -58,7 +58,8 @@ dnf -y --skip-broken install \ tcpdump \ uuid.x86_64 \ which \ - initscripts + initscripts \ + --skip-broken # Generate variation of dhclient-script that we can use for fake vm namespaces. # dhclient-script might not be available though, so don't fail if that's From 41c9e9ef71f146ad38e5b4bcf19461e28124fb01 Mon Sep 17 00:00:00 2001 From: Lucas Vargas Dias Date: Tue, 26 Nov 2024 13:49:15 -0300 Subject: [PATCH 3/5] Reorder --may-exist parameter in ovn_cluster.sh --- ovn_cluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovn_cluster.sh b/ovn_cluster.sh index 9aaa80e..7376862 100755 --- a/ovn_cluster.sh +++ b/ovn_cluster.sh @@ -819,7 +819,7 @@ EOF chmod 0755 ${FAKENODE_MNT_DIR}/create_ovn_res.sh # add ts transit switch. - ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-ic-nbctl ts-add --may-exist ts1 + ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-ic-nbctl --may-exist ts-add ts1 # wait for ovn-ic to kick in while sleep 2; do ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-nbctl ls-list | grep -q ts1 && break From 16f6fe51d17861823050add2e1a27356e8e2d55e Mon Sep 17 00:00:00 2001 From: Lucas Vargas Dias Date: Thu, 31 Oct 2024 13:17:13 -0300 Subject: [PATCH 4/5] Add --may-exist parameter to addition of ts Without --may-exist, ovn-ic-nbctl ts-add ts1 could return error and doesn't execute the following steps of function. Also, fix dnf --skip-broker order to pass tests Signed-off-by: Lucas Vargas Dias --- image/cinc/install_fedora_pkg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/cinc/install_fedora_pkg.sh b/image/cinc/install_fedora_pkg.sh index c7a14c7..8023187 100755 --- a/image/cinc/install_fedora_pkg.sh +++ b/image/cinc/install_fedora_pkg.sh @@ -16,7 +16,7 @@ systemctl mask \ systemd-udevd.service \ systemd-vconsole-setup.service -dnf -y install \ +dnf -y install --skip-broken \ autoconf \ automake \ conntrack-tools \ From 6696188bd9b6cb2ecf5507a74992b89e2b191836 Mon Sep 17 00:00:00 2001 From: Lucas Vargas Dias Date: Thu, 28 Nov 2024 13:15:43 -0300 Subject: [PATCH 5/5] Add --may-exist parameter to addition of ts Without --may-exist, ovn-ic-nbctl ts-add ts1 could return error and doesn't execute the following steps of function. Signed-off-by: Lucas Vargas Dias --- image/cinc/install_fedora_pkg.sh | 2 +- ovn_cluster.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/image/cinc/install_fedora_pkg.sh b/image/cinc/install_fedora_pkg.sh index 8023187..8381966 100755 --- a/image/cinc/install_fedora_pkg.sh +++ b/image/cinc/install_fedora_pkg.sh @@ -16,7 +16,7 @@ systemctl mask \ systemd-udevd.service \ systemd-vconsole-setup.service -dnf -y install --skip-broken \ +dnf -y --skip-broken install \ autoconf \ automake \ conntrack-tools \ diff --git a/ovn_cluster.sh b/ovn_cluster.sh index 7376862..762e66a 100755 --- a/ovn_cluster.sh +++ b/ovn_cluster.sh @@ -819,7 +819,7 @@ EOF chmod 0755 ${FAKENODE_MNT_DIR}/create_ovn_res.sh # add ts transit switch. - ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-ic-nbctl --may-exist ts-add ts1 + ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-ic-nbctl ts-add ts1 # wait for ovn-ic to kick in while sleep 2; do ${RUNC_CMD} exec ${CENTRAL_IC_ID} ovn-nbctl ls-list | grep -q ts1 && break