.azure-pipelines/azure-pipelines-image-template.yml

@@ -48,14 +48,16 @@ jobs:
           ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
-      - script: mv target $(Build.ArtifactStagingDirectory)/
+      - script: |
+          mkdir -p $(Build.ArtifactStagingDirectory)/target
+          mv target/* $(Build.ArtifactStagingDirectory)/target/
         displayName: Copy Artifacts
         condition: always()
       - publish:  $(Build.ArtifactStagingDirectory)
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)'
         displayName: "Archive sonic image"
       - publish:  $(Build.ArtifactStagingDirectory)
-        condition: failed()
+        condition: or(failed(), canceled())
         artifact: 'sonic-buildimage.$(GROUP_NAME)$(GROUP_EXTNAME)$(System.JobAttempt)'
         displayName: "Archive failed sonic image"
       - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:

.github/CODEOWNERS

@@ -19,6 +19,9 @@
 /Makefile.work  @qiluo-msft @xumia @lguohan
 /slave.mk       @qiluo-msft @xumia @lguohan
 /scripts        @qiluo-msft @xumia @lguohan
+/src/sonic-build-hooks/                 @Azure/sonic-build
+/src/debootstrap/                       @Azure/sonic-build
+/src/sonic-fips/                        @Azure/sonic-build
 
 # installer
 /installer/     @qiluo-msft
@@ -31,8 +34,77 @@
 /dockers/docker-config-engine*/         @qiluo-msft
 /dockers/docker-snmp/                   @qiluo-msft
 
-# src
+# kernel
+/src/sonic-linux-kernel/                @Azure/sonic-kernel
+
+# devices
+/device/                                @Azure/sonic-platform
+/src/sonic-platform-common/             @Azure/sonic-platform
+/src/sonic-platform-daemons/            @Azure/sonic-platform
+/src/sonic-platform-pde/                @Azure/sonic-platform
+/src/lm-sensors/                        @Azure/sonic-platform
+/src/flashrom/                          @Azure/sonic-platform
+
+# common library
 /src/initramfs-tools/                   @qiluo-msft
+/src/redis-dump-load/                   @Azure/sonic-management
+/src/sonic-py-common/                   @Azure/sonic-management
+/src/sonic-py-swsssdk/                  @Azure/sonic-management
+/src/sonic-swss-common/                 @Azure/sonic-management
+/src/bash/                              @Azure/sonic-management
+/src/tacacs/                            @Azure/sonic-management
+/src/radius/                            @Azure/sonic-management
+/src/swig/                              @Azure/sonic-management
+/src/socat/                             @Azure/sonic-management
+
+# redis
+/src/redis/                             @Azure/sonic-management
+/src/hiredis/                           @Azure/sonic-management
 
 # yang
 /src/sonic-yang-models/                 @praveen-li @dgsudharsan @rathnasabapathyv @venkatmahalingam @qiluo-msft
+/src/sonic-yang-mgmt/                   @Azure/sonic-management
+/src/libyang/                           @Azure/sonic-management
+/src/libyang1/                          @Azure/sonic-management
+/src/libyang2/                          @Azure/sonic-management
+
+# bgpcfgd
+/src/sonic-bgpcfgd/                     @StormLiangMS
+
+# sonic-config-engine
+/src/sonic-config-engine/               @Azure/sonic-management
+
+# sonic-utilities
+/src/sonic-utilities/                   @Azure/sonic-management
+
+# sonic-telemetry
+/src/sonic-telemetry/                   @Azure/sonic-management
+
+# snmp
+/src/sonic-snmpagent/                   @Azure/sonic-management
+/src/snmpd/                             @Azure/sonic-management
+
+# dhcp relay
+/src/dhcp6relay/                        @Azure/sonic-fundamentals
+/src/dhcpmon/                           @Azure/sonic-fundamentals
+/src/isc-dhcp/                          @Azure/sonic-fundamentals
+
+# sflow
+/src/sflow/                             @Azure/sonic-dataplane
+
+# sonic restapi
+/src/sonic-restapi/                     @Azure/sonic-dataplane
+
+# sonic swss
+/src/sonic-swss/                        @Azure/sonic-dataplane
+
+# linux networking, e.g., libnl3, iproute2, ifupdown2, ethtool
+/src/libnl3/                            @Azure/sonic-dataplane
+/src/iproute2/                          @Azure/sonic-dataplane
+/src/ifupdown2/                         @Azure/sonic-dataplane
+/src/ethtool/                           @Azure/sonic-dataplane
+
+# ptf
+/src/ptf/                               @Azure/sonic-fundamentals
+/src/ptf-py3/                           @Azure/sonic-fundamentals
+/src/scapy/                             @Azure/sonic-fundamentals

.gitignore

@@ -22,6 +22,9 @@ target/
 *.img
 *.pyc
 
+# Slave docker log files
+sonic-slave*/*.log
+
 # Autogenerated Dockerfiles
 sonic-slave*/Dockerfile
 sonic-slave*/Dockerfile.user

Makefile.work

@@ -294,12 +294,18 @@ endif
 
 endif
 
+SPLIT_LOG = | tee
+
+DOCKER_BASE_LOG = $(SLAVE_DIR)/$(SLAVE_BASE_IMAGE)_$(SLAVE_BASE_TAG).log
+DOCKER_LOG = $(SLAVE_DIR)/$(SLAVE_IMAGE)_$(SLAVE_TAG).log
+
+
 DOCKER_BASE_BUILD = docker build --no-cache \
 		    -t $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) \
 		    --build-arg http_proxy=$(http_proxy) \
 		    --build-arg https_proxy=$(https_proxy) \
 		    --build-arg no_proxy=$(no_proxy) \
-		    $(SLAVE_DIR)
+		    $(SLAVE_DIR) $(SPLIT_LOG) $(DOCKER_BASE_LOG)
 
 DOCKER_BASE_PULL = docker pull \
 			$(REGISTRY_SERVER):$(REGISTRY_PORT)/$(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
@@ -312,7 +318,7 @@ DOCKER_BUILD = docker build --no-cache \
                --build-arg slave_base_tag_ref=$(SLAVE_BASE_TAG) \
 	       -t $(SLAVE_IMAGE):$(SLAVE_TAG) \
 	       -f $(SLAVE_DIR)/Dockerfile.user \
-	       $(SLAVE_DIR)
+	       $(SLAVE_DIR) $(SPLIT_LOG) $(DOCKER_LOG)
 
 SONIC_BUILD_INSTRUCTION :=  make \
                            -f slave.mk \

build_image.sh

@@ -200,6 +200,14 @@ elif [ "$IMAGE_TYPE" = "aboot" ]; then
     generate_device_list ".platforms_asic"
     zip -g $OUTPUT_ABOOT_IMAGE .platforms_asic
 
+    if [ "$ENABLE_FIPS" = "y" ]; then
+        echo "sonic_fips=1" > kernel-cmdline
+    else
+        echo "sonic_fips=0" > kernel-cmdline
+    fi
+    zip -g $OUTPUT_ABOOT_IMAGE kernel-cmdline
+    rm kernel-cmdline
+
     zip -g $OUTPUT_ABOOT_IMAGE $ABOOT_BOOT_IMAGE
     rm $ABOOT_BOOT_IMAGE
     if [ "$SONIC_ENABLE_IMAGE_SIGNATURE" = "y" ]; then

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_defaults_t0.j2

@@ -44,3 +44,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/buffers_extra_queues.j2

@@ -0,0 +1 @@
+../Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_defaults_t0.j2

@@ -45,3 +45,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/buffers_extra_queues.j2

@@ -0,0 +1,37 @@
+{% if DEVICE_METADATA is defined and 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+{% if port in port_names_require_extra_buffer.split(',') %}
+        "{{ port }}|0-1": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|2-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|6": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% else %}
+        "{{ port }}|0-2": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|3-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5-7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% endif %}
+{% endfor %}
+    }
+{% endmacro %}
+{% endif %}

device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/qos.json.j2

@@ -35,7 +35,7 @@
             "30": "1",
             "31": "1",
             "32": "1",
-            "33": "2",
+            "33": "8",
             "34": "1",
             "35": "1",
             "36": "1",
@@ -101,7 +101,7 @@
             "30": "1",
             "31": "1",
             "32": "1",
-            "33": "2",
+            "33": "8",
             "34": "1",
             "35": "1",
             "36": "1",
@@ -140,12 +140,13 @@
         "AZURE": {
             "0": "0",
             "1": "0",
-            "2": "0",
+            "2": "2",
             "3": "3",
             "4": "4",
             "5": "0",
-            "6": "0",
-            "7": "7"
+            "6": "6",
+            "7": "7",
+            "8": "0"
         },
         "AZURE_TUNNEL": {
             "0": "0",
@@ -155,7 +156,8 @@
             "4": "6",
             "5": "0",
             "6": "0",
-            "7": "0"
+            "7": "0",
+            "8": "0"
         }
     },
 {%- endmacro %}
@@ -164,12 +166,13 @@
         "AZURE": {
             "0": "0",
             "1": "1",
-            "2": "1",  
+            "2": "1",
             "3": "3",
             "4": "4",
             "5": "5",
             "6": "6",
-            "7": "7"
+            "7": "7",
+            "8": "1"
         },
         "AZURE_TUNNEL": {
             "0": "0",
@@ -179,7 +182,8 @@
             "4": "6",
             "5": "5",
             "6": "1",
-            "7": "7"
+            "7": "7",
+            "8": "1"
         }
     },
 {%- endmacro %}
@@ -188,15 +192,15 @@
         "AZURE_TUNNEL": {
             "0": "8",
             "1": "0",
-            "2": "33",
+            "2": "0",
             "3": "2",
             "4": "6",
             "5": "46",
             "6": "0",
-            "7": "48"
+            "7": "48",
+            "8": "33"
         }
     },
 {%- endmacro %}
 {% endif %}
-
 {%- include 'qos_config.j2' %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t0.j2

@@ -44,3 +44,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_defaults_t1.j2

@@ -50,3 +50,9 @@
         }
     },
 {%- endmacro %}
+
+{% import 'buffers_extra_queues.j2' as defs with context %}
+
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+{{ defs.generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) }}
+{%- endmacro %}

device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/buffers_extra_queues.j2

@@ -0,0 +1,38 @@
+{% if DEVICE_METADATA is defined and 'type' in DEVICE_METADATA['localhost'] and 
+(DEVICE_METADATA['localhost']['type'] == 'LeafRouter' or DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
+{%- macro generate_queue_buffers_with_extra_lossless_queues(port_names, port_names_require_extra_buffer) %}
+    "BUFFER_QUEUE": {
+{% for port in port_names.split(',') %}
+{% if port in port_names_require_extra_buffer.split(',') %}
+        "{{ port }}|0-1": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|2-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|6": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% else %}
+        "{{ port }}|0-2": {
+            "profile" : "egress_lossy_profile"
+        },
+        "{{ port }}|3-4": {
+            "profile" : "egress_lossless_profile"
+        },
+        "{{ port }}|5-7": {
+            "profile" : "egress_lossy_profile"
+        }{% if not loop.last %},{% endif %}
+
+{% endif %}
+{% endfor %}
+    }
+{% endmacro %}
+{% endif %}