Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 23 additions & 48 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ jobs:
- build
- plan

name: "${{ matrix.hybrid && 'h' || 'v' }}-${{ matrix.upgradefrom && 'up' || '' }}${{ matrix.upgradefrom }}${{ matrix.upgradefrom && '-' || '' }}${{ matrix.mesh && 'mesh-' || '' }}${{ matrix.gateway && 'gw-' || '' }}${{ matrix.includeonie && 'onie-' || '' }}${{ matrix.buildmode }}-${{ matrix.vpcmode }}"
name: "${{ matrix.hybrid && 'h' || 'v' }}-${{ matrix.upgradefrom && 'up' || '' }}${{ matrix.upgradefrom }}${{ matrix.upgradefrom && '-' || '' }}${{ matrix.mesh && 'mesh-' || '' }}${{ matrix.gateway == 'dpdk' && 'gwd-' || matrix.gateway == 'kernel' && 'gwk-' || '' }}iso-${{ matrix.vpcmode }}"

uses: githedgehog/fabricator/.github/workflows/run-vlab.yaml@master
with:
Expand All @@ -875,7 +875,7 @@ jobs:
|| !matrix.hybrid
&& !contains(github.event.pull_request.labels.*.name, 'ci:+vlab')
&& !contains(github.event.pull_request.labels.*.name, 'ci:+merge-ready')
|| matrix.upgradefrom != ''
|| matrix.upgradefrom
&& contains(github.event.pull_request.labels.*.name, 'ci:-upgrade')
&& !contains(github.event.pull_request.labels.*.name, 'ci:+merge-ready')
)
Expand All @@ -887,58 +887,34 @@ jobs:
)

|| (github.event_name == 'push' || github.event_name == 'merge_group')
&& matrix.hybrid
&& !!matrix.hybrid
}}
fabricatorref: master
prebuild: |
just bump dataplane ${{ needs.version.outputs.version }}-release
just bump frr ${{ needs.version.outputs.version }}-release
fabricmode: ${{ matrix.fabricmode }}
gateway: ${{ matrix.gateway }}
includeonie: ${{ matrix.includeonie }}
buildmode: ${{ matrix.buildmode }}
prebuild: "just bump dataplane ${{ needs.version.outputs.version }}-release"
fabricmode: spine-leaf
mesh: ${{ !!matrix.mesh }}
gateway: ${{ !!matrix.gateway }}
gatewaydriver: ${{ matrix.gateway }}
includeonie: false
buildmode: iso
vpcmode: ${{ matrix.vpcmode }}
releasetest: ${{ contains(github.event.pull_request.labels.*.name, 'ci:+release') || inputs.enable_release_tests == true }}
hybrid: ${{ matrix.hybrid }}
hybrid: ${{ !!matrix.hybrid }}
upgradefrom: ${{ matrix.upgradefrom }}

strategy:
fail-fast: false
matrix:
fabricmode:
- spine-leaf
gateway:
- true
includeonie:
- false
buildmode:
- iso
vpcmode:
- l2vni
hybrid:
- false
upgradefrom:
- ""
- "26.03"
- "26.04"
include:
# gateway l3vni
- fabricmode: spine-leaf
gateway: true
includeonie: false
buildmode: iso
vpcmode: l3vni
hybrid: false
upgradefrom: ""

# hlab gateway l2vni
- fabricmode: spine-leaf
gateway: true
includeonie: false
buildmode: iso
vpcmode: l2vni
hybrid: true
upgradefrom: ""
- { vpcmode: l2vni, gateway: kernel }
Comment thread
coderabbitai[bot] marked this conversation as resolved.
- { vpcmode: l3vni, gateway: dpdk }

# hlab
- { hybrid: true, vpcmode: l2vni, gateway: kernel }

# upgrades keep the driver and older releases only have kernel gateways in vlab
- { upgradefrom: "26.03", vpcmode: l2vni, gateway: kernel }
- { upgradefrom: "26.04", vpcmode: l2vni, gateway: kernel }

summary:
name: "Summary"
Expand Down Expand Up @@ -1039,14 +1015,13 @@ jobs:
path: fab-repo
persist-credentials: false

- name: Bump dataplane+frr in fabricator
- name: Bump dataplane in fabricator
working-directory: fab-repo
env:
ref_name: ${{ github.ref_name }}
run: |
set -euo pipefail;
sed -i "s/^\tDataplaneVersion.*/\tDataplaneVersion=meta.Version(\"${ref_name}\")/" pkg/fab/versions.go
sed -i "s/^\tFRRVersion.*/\tFRRVersion=meta.Version(\"${ref_name}\")/" pkg/fab/versions.go
go fmt pkg/fab/versions.go

- name: Generate token for the fabricator repository
Expand All @@ -1070,12 +1045,12 @@ jobs:
path: fab-repo
branch: pr/auto/dataplane-bump
commit-message: |
bump: dataplane/frr to ${{ github.ref_name }}
bump: dataplane to ${{ github.ref_name }}

This is an automated commit created by GitHub Actions workflow,
in the dataplane repository.
signoff: true
title: "bump: dataplane/frr to ${{ github.ref_name }}"
title: "bump: dataplane to ${{ github.ref_name }}"
body: |
This is an automated Pull Request created by GitHub Actions workflow,
in the dataplane repository.
Expand Down
Loading