On Mon, Mar 17, 2025 at 6:54 PM MJ Ponsonby <[email protected]> wrote:
> 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]> > --- > .../workflows/ovn-fake-multinode-tests.yml | 12 +++++------ > tests/multinode-macros.at | 20 +++++++++---------- > 2 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/.github/workflows/ovn-fake-multinode-tests.yml > b/.github/workflows/ovn-fake-multinode-tests.yml > index 19d95f175..ce0387a7f 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 > @@ -132,7 +132,7 @@ jobs: > with: > repository: 'ovn-org/ovn-fake-multinode' > path: 'ovn-fake-multinode' > - ref: 'v0.2' > + ref: 'v0.3' > > - name: Start openvswitch > run: | > @@ -150,8 +150,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 > > @@ -187,8 +187,8 @@ jobs: > - name: Run fake-multinode system tests > run: | > if ! sudo 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 29f0711e6..04eafa995 100644 > --- a/tests/multinode-macros.at > +++ b/tests/multinode-macros.at > @@ -67,11 +67,11 @@ m_as() { > } > > m_central_as () { > - podman exec ovn-central-az1-1 "$@" > + podman exec ovn-central-az1 "$@" > } > > check_fake_multinode_setup() { > - check m_as ovn-central-az1-1 ovn-nbctl --wait=sb sync > + check m_as ovn-central-az1 ovn-nbctl --wait=sb sync > AT_CHECK([m_as ovn-chassis-1 ovn-appctl -t ovn-controller version], > [0], [ignore]) > AT_CHECK([m_as ovn-chassis-2 ovn-appctl -t ovn-controller version], > [0], [ignore]) > AT_CHECK([m_as ovn-gw-1 ovn-appctl -t ovn-controller version], [0], > [ignore]) > @@ -79,9 +79,9 @@ check_fake_multinode_setup() { > } > > cleanup_multinode_resources() { > - 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 in ovn-chassis-1 ovn-chassis-2 ovn-gw-1 > do > m_as $c ovs-vsctl del-br br-int > @@ -90,11 +90,11 @@ cleanup_multinode_resources() { > } > > multinode_nbctl () { > - m_as ovn-central-az1-1 ovn-nbctl "$@" > + m_as ovn-central-az1 ovn-nbctl "$@" > } > > 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 in $1 > do > AT_CHECK([m_as $c ovn-appctl -t ovn-controller version], [0], > [ignore]) > @@ -102,9 +102,9 @@ check_fake_multinode_setup_by_nodes() { > } > > 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 in $1 > do > m_as $c ovs-vsctl del-br br-int > -- > 2.43.0 > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > Looks good to me, thanks. Acked-by: Ales Musil <[email protected]> _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
