| Message ID | 20240417070907.503472-1-amusil@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,v4,1/2] ci: Make sure that multinode test runs on correct branch. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
On Wed, Apr 17, 2024 at 9:09 AM Ales Musil <amusil@redhat.com> 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 <amusil@redhat.com> > --- > v4: Return job permutation that was accidentally removed. > --- > .github/workflows/ovn-fake-multinode-tests.yml | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/.github/workflows/ovn-fake-multinode-tests.yml > b/.github/workflows/ovn-fake-multinode-tests.yml > index ed4d6c4ef..5c9030a49 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 > @@ -76,16 +76,16 @@ jobs: > fail-fast: false > matrix: > cfg: > - - { branch: "main", testsuiteflags: ""} > + - { branch: "${{ github.ref_name }}", 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 +114,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 +122,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 > -- > 2.44.0 > > Recheck-request: github-robot-_ovn-kubernetes
diff --git a/.github/workflows/ovn-fake-multinode-tests.yml b/.github/workflows/ovn-fake-multinode-tests.yml index ed4d6c4ef..5c9030a49 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 @@ -76,16 +76,16 @@ jobs: fail-fast: false matrix: cfg: - - { branch: "main", testsuiteflags: ""} + - { branch: "${{ github.ref_name }}", 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 +114,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 +122,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
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 <amusil@redhat.com> --- v4: Return job permutation that was accidentally removed. --- .github/workflows/ovn-fake-multinode-tests.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)