On Tue, Apr 16, 2024 at 3:28 PM Mark Michelson <[email protected]> wrote:
> This looks good to me. Thanks Ales. > > Acked-by: Mark Michelson <[email protected]> > Thanks. I applied this patch to the main. @Mark - I'm sorry. I missed adding your Ack to this patch. Numan > On 4/10/24 09:29, Ales Musil wrote: > > The ovn-fake-multinode workflow can be triggered manually, > > however the definition didn't respect the branch for the manual > > run and always used main branch. Make sure that the correct > > branch is used for the ovn-fake-multinode workflow. > > > > Fixes: 033f5bebf94d ("CI: Add a couple of periodic jobs using > ovn-fake-multinode.") > > Signed-off-by: Ales Musil <[email protected]> > > --- > > .github/workflows/ovn-fake-multinode-tests.yml | 15 +++++++-------- > > 1 file changed, 7 insertions(+), 8 deletions(-) > > > > diff --git a/.github/workflows/ovn-fake-multinode-tests.yml > b/.github/workflows/ovn-fake-multinode-tests.yml > > index 79b6c4253..f097ee9a1 100644 > > --- a/.github/workflows/ovn-fake-multinode-tests.yml > > +++ b/.github/workflows/ovn-fake-multinode-tests.yml > > @@ -17,7 +17,7 @@ jobs: > > strategy: > > matrix: > > cfg: > > - - { branch: "main" } > > + - { branch: "${{ github.ref_name }}" } > > - { branch: "branch-22.03" } > > env: > > RUNC_CMD: podman > > @@ -47,7 +47,7 @@ jobs: > > with: > > path: 'ovn-fake-multinode/ovn' > > submodules: recursive > > - ref: ${{ matrix.cfg.branch }} > > + ref: "${{ matrix.cfg.branch }}" > > > > - name: Install dependencies > > run: | > > @@ -76,16 +76,15 @@ jobs: > > fail-fast: false > > matrix: > > cfg: > > - - { branch: "main", testsuiteflags: ""} > > - { branch: "branch-22.03", testsuiteflags: "-k 'basic test'" } > > name: multinode tests ${{ join(matrix.cfg.*, ' ') }} > > env: > > RUNC_CMD: podman > > OS_IMAGE: "fedora:37" > > CENTRAL_IMAGE: "ovn/ovn-multi-node:${{ matrix.cfg.branch }}" > > - CHASSIS_IMAGE: "ovn/ovn-multi-node:main" > > - RELAY_IMAGE: "ovn/ovn-multi-node:main" > > - GW_IMAGE: "ovn/ovn-multi-node:main" > > + CHASSIS_IMAGE: "ovn/ovn-multi-node:${{ github.ref_name }}" > > + RELAY_IMAGE: "ovn/ovn-multi-node:${{ github.ref_name }}" > > + GW_IMAGE: "ovn/ovn-multi-node:${{ github.ref_name }}" > > # Disable SSL for now. Revisit this if required. > > ENABLE_SSL: no > > CC: gcc > > @@ -114,7 +113,7 @@ jobs: > > > > - uses: actions/download-artifact@v4 > > with: > > - name: test-main-image > > + name: test-${{ github.ref_name }}-image > > > > - uses: actions/download-artifact@v4 > > with: > > @@ -122,7 +121,7 @@ jobs: > > > > - name: Load podman image > > run: | > > - sudo podman load --input ovn_main_image.tar > > + sudo podman load --input ovn_${{ github.ref_name }}_image.tar > > sudo podman load --input ovn_branch-22.03_image.tar > > > > - name: Check out ovn-fake-multi-node > > _______________________________________________ > dev mailing list > [email protected] > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
