Delete stretch and jessie references

.azure-pipelines/docker-sonic-slave-template.yml

@@ -2,7 +2,7 @@
 # Start with a minimal pipeline that you can customize to build and deploy your code.
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
-# Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+# Build and push sonic-slave-[bullseye|buster] images for amd64/armhf/arm64
 parameters:
 - name: arch
   type: string
@@ -18,8 +18,6 @@ parameters:
   values:
   - bullseye
   - buster
-  - stretch
-  - jessie
 - name: registry_url
   type: string
   default: sonicdev-microsoft.azurecr.io

.azure-pipelines/docker-sonic-slave.yml

@@ -2,7 +2,7 @@
 # Start with a minimal pipeline that you can customize to build and deploy your code.
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
-# Build and push sonic-slave-[buster|jessie|stretch] images for amd64/armhf/arm64
+# Build and push sonic-slave-[bullseye|buster] images for amd64/armhf/arm64
 resources:
   repositories:
   - repository: buildimage
@@ -46,8 +46,6 @@ parameters:
   default:
   - bullseye
   - buster
-  - stretch
-  - jessie
 - name: registry_url
   type: string
   default: sonicdev-microsoft.azurecr.io

Makefile

@@ -1,7 +1,5 @@
 # SONiC make file
 
-NOJESSIE ?= 1
-NOSTRETCH ?= 1
 NOBUSTER ?= 0
 NOBULLSEYE ?= 0
 
@@ -13,14 +11,6 @@ override SONIC_OVERRIDE_BUILD_VARS += $(SONIC_BUILD_VARS)
 override SONIC_OVERRIDE_BUILD_VARS += Q=$(Q)
 export Q SONIC_OVERRIDE_BUILD_VARS
 
-ifeq ($(NOJESSIE),0)
-BUILD_JESSIE=1
-endif
-
-ifeq ($(NOSTRETCH),0)
-BUILD_STRETCH=1
-endif
-
 ifeq ($(NOBUSTER),0)
 BUILD_BUSTER=1
 endif
@@ -37,12 +27,6 @@ MAKE_WITH_RETRY := ./scripts/run_with_retry $(MAKE)
 
 %::
 	@echo "+++ --- Making $@ --- +++"
-ifeq ($(NOJESSIE), 0)
-	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) -f Makefile.work jessie
-endif
-ifeq ($(NOSTRETCH), 0)
-	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch -f Makefile.work stretch
-endif
 ifeq ($(NOBUSTER), 0)
 	$(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=buster -f Makefile.work buster
 endif
@@ -51,18 +35,6 @@ ifeq ($(NOBULLSEYE), 0)
 endif
 	BLDENV=bullseye $(MAKE) -f Makefile.work docker-cleanup
 
-jessie:
-	@echo "+++ Making $@ +++"
-ifeq ($(NOJESSIE), 0)
-	$(MAKE) -f Makefile.work jessie
-endif
-
-stretch:
-	@echo "+++ Making $@ +++"
-ifeq ($(NOSTRETCH), 0)
-	$(MAKE) -f Makefile.work stretch
-endif
-
 buster:
 	@echo "+++ Making $@ +++"
 ifeq ($(NOBUSTER), 0)
@@ -78,8 +50,6 @@ init:
 #
 define make_work
 	@echo "+++ Making $@ +++"
-	$(if $(BUILD_JESSIE),$(MAKE) -f Makefile.work $@,)
-	$(if $(BUILD_STRETCH),BLDENV=stretch $(MAKE) -f Makefile.work $@,)
 	$(if $(BUILD_BUSTER),BLDENV=buster $(MAKE) -f Makefile.work $@,)
 	$(if $(BUILD_BULLSEYE),BLDENV=bullseye $(MAKE) -f Makefile.work $@,)
 endef

Makefile.cache

@@ -75,9 +75,7 @@ SONIC_COMMON_FLAGS_LIST :=  $(CONFIGURED_PLATFORM) \
                             $(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC)
 SONIC_COMMON_DPKG_LIST  :=  debian/control debian/changelog debian/rules \
                             debian/compat debian/install debian/copyright
-SONIC_COMMON_BASE_FILES_LIST  := sonic-slave-jessie/Dockerfile.j2 sonic-slave-jessie/Dockerfile.user.j2 \
-                                 sonic-slave-stretch/Dockerfile.j2 sonic-slave-stretch/Dockerfile.user.j2 \
-                                 sonic-slave-buster/Dockerfile.j2 sonic-slave-buster/Dockerfile.user.j2 \
+SONIC_COMMON_BASE_FILES_LIST  := sonic-slave-buster/Dockerfile.j2 sonic-slave-buster/Dockerfile.user.j2 \
                                  sonic-slave-bullseye/Dockerfile.j2 sonic-slave-bullseye/Dockerfile.user.j2
 
 

Makefile.work

@@ -121,14 +121,10 @@ else
 TARGET_BOOTLOADER = uboot
 endif
 
-ifeq ($(BLDENV), bullseye)
-SLAVE_DIR = sonic-slave-bullseye
-else ifeq ($(BLDENV), buster)
+ifeq ($(BLDENV), buster)
 SLAVE_DIR = sonic-slave-buster
-else ifeq ($(BLDENV), stretch)
-SLAVE_DIR = sonic-slave-stretch
 else
-SLAVE_DIR = sonic-slave-jessie
+SLAVE_DIR = sonic-slave-bullseye
 endif
 
 # Define a do-nothing target for rules/config.user so that when

README.md

@@ -216,12 +216,12 @@ using cross-compilation, run the following commands:
 ```shell
 # Execute make configure once to configure ASIC and ARCH for cross-compilation build
 
-NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 \
+BLDENV=bullseye CROSS_BLDENV=1 \
 make configure PLATFORM=marvell-armhf PLATFORM_ARCH=armhf
 
 # Execute Arm32 build using cross-compilation environment
 
-NOJESSIE=1 NOSTRETCH=1 BLDENV=buster CROSS_BLDENV=1 make target/sonic-marvell-armhf.bin
+BLDENV=bullseye CROSS_BLDENV=1 make target/sonic-marvell-armhf.bin
 ```
 
 Running the above Arm32 build using cross-compilation instead of qemu emulator
@@ -269,8 +269,6 @@ ONIE image is used for all other Broadcom ASIC based devices.
 
 ```shell
 make configure PLATFORM=broadcom
-# build debian stretch required targets
-BLDENV=stretch make stretch
 # build ONIE image
 make target/sonic-broadcom.bin
 # build EOS image