From: MJ Ponsonby <[email protected]> Allows the ci to use the ovn-fake-multinode v0.3[1] version instead of the v0.2 version, which includes a number of changes, few are noticeable to the end user but the major one includes the central node naming fix.
[1]: https://github.com/ovn-org/ovn-fake-multinode/releases/tag/v0.3 Signed-off-by: MJ Ponsonby <[email protected]> Acked-by: Ales Musil <[email protected]> Signed-off-by: Dumitru Ceara <[email protected]> (cherry picked from commit e64a15ef77156a6130f543d9b2732a7ccfe6d14d) (amended due to patch order) --- .github/workflows/ovn-fake-multinode-tests.yml | 12 ++++++------ tests/multinode-macros.at | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ovn-fake-multinode-tests.yml b/.github/workflows/ovn-fake-multinode-tests.yml index 11fd7dc08..d0886c6c7 100644 --- a/.github/workflows/ovn-fake-multinode-tests.yml +++ b/.github/workflows/ovn-fake-multinode-tests.yml @@ -31,7 +31,7 @@ jobs: with: repository: 'ovn-org/ovn-fake-multinode' path: 'ovn-fake-multinode' - ref: 'v0.2' + ref: 'v0.3' # Check out ovn and ovs separately inside ovn-fake-multinode/ovn and ovn-fake-multinode/ovs # ovn-fake-multinode builds and installs ovs from ovn-fake-multinode/ovs @@ -154,7 +154,7 @@ jobs: with: repository: 'ovn-org/ovn-fake-multinode' path: 'ovn-fake-multinode' - ref: 'v0.2' + ref: 'v0.3' - name: Start openvswitch run: | @@ -164,8 +164,8 @@ jobs: - name: Start basic cluster run: | sudo -E CHASSIS_COUNT=4 GW_COUNT=4 ./ovn_cluster.sh start - sudo podman exec -it ovn-central-az1-1 ovn-nbctl show - sudo podman exec -it ovn-central-az1-1 ovn-appctl -t ovn-northd version + sudo podman exec -it ovn-central-az1 ovn-nbctl show + sudo podman exec -it ovn-central-az1 ovn-appctl -t ovn-northd version sudo podman exec -it ovn-chassis-1 ovn-appctl -t ovn-controller version working-directory: ovn-fake-multinode @@ -201,8 +201,8 @@ jobs: - name: Run fake-multinode system tests run: | if ! sudo -E make check-multinode TESTSUITEFLAGS="${{ matrix.cfg.testsuiteflags }}"; then - sudo podman exec -it ovn-central-az1-1 ovn-nbctl show || : - sudo podman exec -it ovn-central-az1-1 ovn-sbctl show || : + sudo podman exec -it ovn-central-az1 ovn-nbctl show || : + sudo podman exec -it ovn-central-az1 ovn-sbctl show || : sudo podman exec -it ovn-chassis-1 ovs-vsctl show || : sudo podman exec -it ovn-chassis-1 ip netns || : sudo podman exec -it ovn-chassis-1 cat /var/log/ovn/ovn-controller.log || : diff --git a/tests/multinode-macros.at b/tests/multinode-macros.at index 6b765e53b..a4a57e714 100644 --- a/tests/multinode-macros.at +++ b/tests/multinode-macros.at @@ -68,19 +68,19 @@ m_as() { } m_central_as () { - podman exec ovn-central-az1-1 "$@" + podman exec ovn-central-az1 "$@" } multinode_nbctl () { - m_as ovn-central-az1-1 ovn-nbctl "$@" + m_as ovn-central-az1 ovn-nbctl "$@" } multinode_sbctl () { - m_as ovn-central-az1-1 ovn-sbctl "$@" + m_as ovn-central-az1 ovn-sbctl "$@" } check_fake_multinode_setup_by_nodes() { - check m_as ovn-central-az1-1 ovn-nbctl --wait=sb sync + check m_as ovn-central-az1 ovn-nbctl --wait=sb sync for c; do AT_CHECK([m_as $c ovn-appctl -t ovn-controller version], [0], [ignore]) on_exit "m_as $c ovs-vsctl list Interface > interfaces-${c}.txt" @@ -122,9 +122,9 @@ check_fake_multinode_setup() { } cleanup_multinode_resources_by_nodes() { - m_as ovn-central-az1-1 rm -f /etc/ovn/ovnnb_db.db - m_as ovn-central-az1-1 /usr/share/ovn/scripts/ovn-ctl restart_northd - check m_as ovn-central-az1-1 ovn-nbctl --wait=sb sync + m_as ovn-central-az1 rm -f /etc/ovn/ovnnb_db.db + m_as ovn-central-az1 /usr/share/ovn/scripts/ovn-ctl restart_northd + check m_as ovn-central-az1 ovn-nbctl --wait=sb sync for c; do m_as $c ovs-vsctl del-br br-int m_as $c ip --all netns delete -- 2.47.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
