make should build antrea-agent-ubuntu and antrea-controller-ubuntu (#…

…5930) Some test scripts call `make` to build test images. Also, as the most used make target, it should build the most frequently used images, not the legacy image. Remove "--skip-unified-image" from build-antrea-linux-all.sh as it's never used and the script is meant to build all images. Signed-off-by: Quan Tian <[email protected]>
antrea-io · Feb 6, 2024 · 7055147 · 7055147
1 parent 4beb773
commit 7055147
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -154,7 +154,8 @@ test-integration:
 endif
 
 .PHONY: build
-build: build-ubuntu
+build: build-agent-ubuntu
+build: build-controller-ubuntu
 
 .PHONY: test
 test: golangci

diff --git a/hack/build-antrea-linux-all.sh b/hack/build-antrea-linux-all.sh
@@ -28,8 +28,7 @@ all Dockerfiles.
         --push-base-images      Push built images to the registry. Only base images will be pushed.
         --coverage              Build the image with support for code coverage.
         --platform <PLATFORM>   Target platform for the images if server is multi-platform capable.
-        --distro <distro>       Target Linux distribution.
-        --skip-unified-image    Skips building the Antrea unified image."
+        --distro <distro>       Target Linux distribution."
 
 function print_usage {
     echoerr "$_usage"
@@ -40,7 +39,6 @@ PUSH=false
 COVERAGE=false
 PLATFORM=""
 DISTRO="ubuntu"
-UNIFIED=true
 
 while [[ $# -gt 0 ]]
 do
@@ -67,10 +65,6 @@ case $key in
     DISTRO="$2"
     shift 2
     ;;
-    --skip-unified-image)
-    UNIFIED=false
-    shift 2
-    ;;
     -h|--help)
     print_usage
     exit 0
@@ -170,22 +164,16 @@ if [ "$DISTRO" == "ubuntu" ]; then
     if $COVERAGE; then
         make build-controller-ubuntu-coverage
         make build-agent-ubuntu-coverage
-        if $UNIFIED; then
-            make build-ubuntu-coverage
-        fi
+        make build-ubuntu-coverage
     else
         make build-controller-ubuntu
         make build-agent-ubuntu
-        if $UNIFIED; then
-            make
-        fi
+        make build-ubuntu
     fi
 elif [ "$DISTRO" == "ubi" ]; then
     make build-controller-ubi
     make build-agent-ubi
-    if $UNIFIED; then
-        make build-ubi
-    fi
+    make build-ubi
 fi
 
 popd > /dev/null