Remove RIF from m_rifsToAdd before deleting it - BUILDIMAGE to TEST

.azure-pipelines/azure-pipelines-build.yml

@@ -186,3 +186,13 @@ jobs:
           fi
         displayName: "Build sonic image"
       - template: .azure-pipelines/check-dirty-version.yml@buildimage
+      - task: ManifestGeneratorTask@0
+        condition: ne(variables.SKIP_MG, 'y')
+        timeoutInMinutes: 60
+        continueOnError: true
+        displayName: "Manifest Generator"
+        inputs:
+          BuildDropPath: '$(System.DefaultWorkingDirectory)/target/'
+          ManifestDirPath: 'target/'
+          BuildComponentPath: $(System.DefaultWorkingDirectory)/src/
+

.gitmodules

@@ -1,15 +1,15 @@
 [submodule "sonic-swss-common"]
 	path = src/sonic-swss-common
-	url = https://github.com/sonic-net/sonic-swss-common
+	url = git@github.com:nvidia-sonic/sonic-swss-common.git
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
 	url = https://github.com/sonic-net/sonic-linux-kernel
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
-	url = https://github.com/sonic-net/sonic-sairedis
+	url = git@github.com:nvidia-sonic/sonic-sairedis.git
 [submodule "sonic-swss"]
 	path = src/sonic-swss
-	url = https://github.com/sonic-net/sonic-swss
+	url = git@github.com:tshalvi/sonic-swss.git
 [submodule "src/p4c-bm/p4c-bm"]
 	path = platform/p4/p4c-bm/p4c-bm
 	url = https://github.com/krambn/p4c-bm
@@ -30,16 +30,16 @@
 	url = https://github.com/p4lang/ptf.git
 [submodule "src/sonic-utilities"]
 	path = src/sonic-utilities
-	url = https://github.com/sonic-net/sonic-utilities
+	url = git@github.com:nvidia-sonic/sonic-utilities.git
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "src/sonic-platform-common"]
 	path = src/sonic-platform-common
-	url = https://github.com/sonic-net/sonic-platform-common
+	url = git@github.com:nvidia-sonic/sonic-platform-common.git
 [submodule "src/sonic-platform-daemons"]
 	path = src/sonic-platform-daemons
-	url = https://github.com/sonic-net/sonic-platform-daemons
+	url = git@github.com:nvidia-sonic/sonic-platform-daemons.git
 [submodule "src/sonic-platform-pde"]
 	path = src/sonic-platform-pde
 	url = https://github.com/sonic-net/sonic-platform-pdk-pde
@@ -70,7 +70,7 @@
 	url = https://github.com/sonic-net/sonic-mgmt-framework
 [submodule "src/sonic-ztp"]
 	path = src/sonic-ztp
-	url = https://github.com/sonic-net/sonic-ztp
+	url = git@github.com:nvidia-sonic/sonic-ztp.git
 [submodule "src/sonic-restapi"]
 	path = src/sonic-restapi
 	url = https://github.com/sonic-net/sonic-restapi.git
@@ -124,3 +124,4 @@
 [submodule "platform/innovium/sonic-platform-marvell"]
 	path = platform/innovium/sonic-platform-marvell
 	url = https://github.com/Marvell-switching/sonic-platform-marvell
+

Makefile.work

@@ -68,7 +68,11 @@ SHELL = /bin/bash
 USER := $(shell id -un)
 PWD := $(shell pwd)
 USER_LC := $(shell echo $(USER) | tr A-Z a-z)
+ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
+DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:buster uname -m)
+else
 DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
+endif
 HOST_DOCKERD_GID := $(shell getent group docker | cut -d : -f3)
 
 comma := ,

azure-pipelines.yml

@@ -261,22 +261,6 @@ stages:
           MAX_WORKER: $(T0_SONIC_INSTANCE_NUM)
           MGMT_BRANCH: $(BUILD_BRANCH)
 
-  - job: onboarding_elastictest_t0
-    displayName: "onboarding testcases by Elastictest"
-    timeoutInMinutes: 240
-    continueOnError: true
-    pool: sonic-ubuntu-1c
-    steps:
-      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
-        parameters:
-          TOPOLOGY: t0
-          MIN_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM)
-          MAX_WORKER: $(T0_ONBOARDING_SONIC_INSTANCE_NUM)
-          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
-          MGMT_BRANCH: $(BUILD_BRANCH)
-          TEST_SET: onboarding_t0
-
-
 #  - job: wan_elastictest
 #    displayName: "kvmtest-wan by Elastictest"
 #    pool: sonic-ubuntu-1c

build_debian.sh

@@ -33,7 +33,7 @@ CONFIGURED_ARCH=$([ -f .arch ] && cat .arch || echo amd64)
 ## docker engine version (with platform)
 DOCKER_VERSION=5:24.0.2-1~debian.12~$IMAGE_DISTRO
 CONTAINERD_IO_VERSION=1.6.21-1
-LINUX_KERNEL_VERSION=6.1.0-11-2
+LINUX_KERNEL_VERSION=6.1.0-22-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -703,9 +703,18 @@ if [[ $SECURE_UPGRADE_MODE == 'dev' || $SECURE_UPGRADE_MODE == "prod" && $SONIC_
     echo "Secure Boot support build stage: Starting .."
 
     # debian secure boot dependecies
-    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install      \
-        shim-unsigned \
-        grub-efi
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install grub-efi
+
+    # TEMP: Remove after merging SONiC 202311. Instead of that piece of code we
+    # must install shim-unsigned using apt-get
+    if [[ $CONFIGURED_ARCH == armhf ]]; then
+        sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install shim-unsigned
+    else
+        wget http://ftp.debian.org/debian/pool/main/s/shim/shim-unsigned_15.8-1~deb11u1_$CONFIGURED_ARCH.deb -O shim-unsigned.deb
+        sudo mv shim-unsigned.deb $FILESYSTEM_ROOT/tmp/
+        sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT dpkg -i /tmp/shim-unsigned.deb
+        sudo rm -f $FILESYSTEM_ROOT/tmp/shim-unsigned.deb
+    fi
 
     if [ ! -f $SECURE_UPGRADE_SIGNING_CERT ]; then
         echo "Error: SONiC SECURE_UPGRADE_SIGNING_CERT=$SECURE_UPGRADE_SIGNING_CERT key missing"
@@ -839,6 +848,24 @@ sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
 sudo rm -f $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/original
 sudo cp files/image_config/resolv-config/resolv.conf.head $FILESYSTEM_ROOT/etc/resolvconf/resolv.conf.d/head
 
+## Add debug messages in DNS
+filename="$FILESYSTEM_ROOT/sbin/resolvconf"
+sudo sed -i '/report_err \"Run lock held by another process for longer than $LOCK_WAIT_S seconds\"; exit 1; /a \    echo \"${MYNAME} Run lock obtained by PID $$, PPID $PPID\" >&2 ;' $filename
+sudo sed -i '/: >| \"$ENABLE_UPDATES_FLAGFILE\" || exit 1/c\	: >| \"$ENABLE_UPDATES_FLAGFILE\" || { report_err \"Unable to create ENABLE_UPDATES_FLAGFILE\"; exit 1 ; }' $filename
+sudo sed -i '/rm -f "$ENABLE_UPDATES_FLAGFILE" || exit 1/c\	rm -f \"$ENABLE_UPDATES_FLAGFILE\" || { report_err \"Unable to remove ENABLE_UPDATES_FLAGFILE\"; exit 1 ; }' $filename
+repl_text="{ report_err \"ENABLE_UPDATES_FLAGFILE does not exist\"; exit 1; }"
+sudo awk -v replacement="$repl_text" '
+    {
+        count += gsub(/exit 1/, "exit 1")
+        if (count > 11 && sub(/exit 1/, replacement)){
+            count = -999
+        }
+        print
+    }
+    ' "$filename" > temp_file && sudo mv temp_file "$filename"
+sudo chmod +x $filename
+
+
 ## Optimize filesystem size
 if [ "$BUILD_REDUCE_IMAGE_SIZE" = "y" ]; then
    sudo scripts/build-optimize-fs-size.py "$FILESYSTEM_ROOT" \

device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32-100Gx48-400Gx8/hwsku.json

@@ -0,0 +1,104 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet8": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet16": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet24": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet32": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet40": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet48": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet56": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet64": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet72": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet80": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet88": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet96": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet104": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet112": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet120": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet128": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet136": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet144": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet152": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet160": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet168": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet176": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet184": {
+            "default_brkout_mode": "2x100G[50G,40G,25G,10G]"
+        },
+        "Ethernet192": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet200": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet208": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet216": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet224": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet232": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet240": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet248": {
+            "default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G]"
+        },
+        "Ethernet256": {
+            "default_brkout_mode": "1x10G",
+            "fec": "none"
+        }
+    }
+}