Skip to content

Bump and enable gw testing #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Bump and enable gw testing #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f26612
ci(vlab): actually enable gw peering testing
Frostman Jul 24, 2025
5736f68
ci: test gw many times DO NOT MERGE
Frostman Jul 28, 2025
821bd73
bump: dp and frr to latest master
Frostman Jul 25, 2025
f4b46f7
bump: dp to tentative fix vpc manager
Fredi-raspall Aug 8, 2025
4161e85
bump: dp w/ fix vrf iterator
Fredi-raspall Aug 11, 2025
a19e484
bump: dp w/ stacked fixes
Fredi-raspall Aug 11, 2025
9099f4d
bump: dp latest
Fredi-raspall Aug 11, 2025
023d3ab
bump: set correct frr version
Fredi-raspall Aug 12, 2025
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
60 changes: 15 additions & 45 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ jobs:
needs:
- test-build

name: "${{ matrix.hybrid && 'hlab' || 'vlab' }}-${{ matrix.fabricmode == 'spine-leaf' && 'sl' || 'cc' }}-${{ matrix.mesh && 'mesh-' || '' }}${{ matrix.gateway && 'gw-' || '' }}${{ matrix.includeonie && 'onie-' || '' }}${{ matrix.buildmode }}-${{ matrix.vpcmode }}"
name: "${{ matrix.hybrid && 'hlab' || 'vlab' }}-${{ matrix.fabricmode == 'spine-leaf' && 'sl' || 'cc' }}-${{ matrix.mesh && 'mesh-' || '' }}${{ matrix.gateway && 'gw-' || '' }}${{ matrix.includeonie && 'onie-' || '' }}${{ matrix.buildmode }}-${{ matrix.vpcmode }}-${{ matrix.extra }}"

uses: ./.github/workflows/run-vlab.yaml
with:
Expand All @@ -231,6 +231,7 @@ jobs:
vpcmode: ${{ matrix.vpcmode }}
releasetest: ${{ inputs.releasetest == true || contains(github.event.pull_request.labels.*.name, 'ci:+release') }}
hybrid: ${{ matrix.hybrid }}
extra: ${{ matrix.extra }}

strategy:
fail-fast: false
Expand All @@ -240,7 +241,7 @@ jobs:
mesh:
- false
gateway:
- false
- true
includeonie:
- false
buildmode:
Expand All @@ -251,49 +252,18 @@ jobs:
- l2vni
hybrid:
- false
include:
- fabricmode: collapsed-core
mesh: false
includeonie: false
gateway: false
buildmode: iso
vpcmode: l2vni
hybrid: false
- fabricmode: spine-leaf
mesh: false
gateway: true
includeonie: true
buildmode: usb
vpcmode: l2vni
hybrid: false
- fabricmode: spine-leaf
mesh: false
gateway: true
includeonie: true
buildmode: iso
vpcmode: l2vni
hybrid: false
- fabricmode: spine-leaf
mesh: false
gateway: false
includeonie: false
buildmode: iso
vpcmode: l3vni
hybrid: false
- fabricmode: spine-leaf
mesh: false
gateway: true
includeonie: false
buildmode: iso
vpcmode: l2vni
hybrid: false
- fabricmode: spine-leaf
mesh: false
gateway: false
includeonie: false
buildmode: iso
vpcmode: l2vni
hybrid: true
extra:
- "01"
- "02"
- "03"
- "04"
- "05"
- "06"
- "07"
- "08"
- "09"
- "10"


vlab-upgrade:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:-upgrade') && !contains(github.event.pull_request.labels.*.name, 'ci:-vlab') }}
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/run-vlab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ on:
type: boolean
required: false
default: false
extra:
description: "Extra name part"
type: string
required: false
default: ""
debug:
description: "Enable tmate debugging"
type: boolean
Expand All @@ -68,7 +73,7 @@ permissions:

env:
# global workflow configs
slug: "${{ inputs.hybrid && 'hlab' || 'vlab' }}-${{ inputs.fabricmode == 'spine-leaf' && 'sl' || 'cc' }}-${{ inputs.mesh && 'mesh-' || '' }}${{ inputs.gateway && 'gw-' || '' }}${{ inputs.includeonie && 'onie-' || '' }}${{ inputs.buildmode }}-${{ inputs.vpcmode }}"
slug: "${{ inputs.hybrid && 'hlab' || 'vlab' }}-${{ inputs.fabricmode == 'spine-leaf' && 'sl' || 'cc' }}-${{ inputs.mesh && 'mesh-' || '' }}${{ inputs.gateway && 'gw-' || '' }}${{ inputs.includeonie && 'onie-' || '' }}${{ inputs.buildmode }}-${{ inputs.vpcmode }}${{ inputs.extra }}"
# env vars to configure hhfab
HHFAB_REG_REPO: 127.0.0.1:30000
HHFAB_VLAB_COLLECT: true
Expand Down Expand Up @@ -97,6 +102,7 @@ jobs:
echo " VPC mode: ${{ inputs.vpcmode }}"
echo " Release test: ${{ inputs.releasetest }}"
echo " Hybrid: ${{ inputs.hybrid }}"
echo " Extra: ${{ inputs.extra }}"
echo " Debug: ${{ inputs.debug }}"
echo "Calculated:"
echo " Slug: ${{ env.slug }}"
Expand Down Expand Up @@ -186,7 +192,7 @@ jobs:
${{ inputs.hybrid && '--ready switch-reinstall' || '' }} \
--ready=inspect \
--ready=setup-vpcs \
${{ !inputs.gateway && '--ready=setup-peerings' || '' }} \
--ready=setup-peerings \
--ready=test-connectivity \
${{ inputs.releasetest && '--ready=release-test' || '' }} \
--ready=exit
Expand Down
4 changes: 2 additions & 2 deletions pkg/fab/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ var (
FabricatorVersion = meta.Version(version.Version)
FabricVersion = meta.Version("v0.87.4")
GatewayVersion = meta.Version("v0.17.0")
DataplaneVersion = meta.Version("main.x86_64-unknown-linux-gnu.debug.f27f76cd91213cf4dc85d0dab95e7c70ede30efc")
FRRVersion = meta.Version("0ba323e489ea2baf3f85fc42ff23aff674a25690.debug")
DataplaneVersion = meta.Version("pr-fredi-fix-vpc-mgr.x86_64-unknown-linux-gnu.debug.1ccee3f59fa639e00b67c157c0e8ca529f396362")
FRRVersion = meta.Version("0e2c2eb86fe78685f99e5c6cd2663d5bc5bbb0dc.debug")
BCMSONiCVersion = meta.Version("v4.5.0")

// Upgrade constraints, "-0" to include pre-releases
Expand Down
Loading