From 49bf199a3751ba3c506a7325ce7e08eeb1bb33c5 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Sun, 14 Dec 2025 23:16:03 +0000 Subject: [PATCH 01/11] upgrade debain to bookworm Signed-off-by: yijingyan2 --- Dockerfile.build | 26 ++++++++++++++++---------- Dockerfile.test | 6 +++--- dependencies.conf | 12 ++++++------ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index c677b97..361331a 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,9 +1,9 @@ -FROM debian:buster +FROM debian:bookworm ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -RUN echo "deb http://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list RUN apt-get update \ && apt-get install -y \ @@ -17,7 +17,7 @@ RUN apt-get update \ flex \ g++ \ git \ - libboost-serialization1.71-dev \ + libboost-serialization1.74-dev \ libhiredis-dev \ libzmq5-dev \ libevent-dev \ @@ -25,7 +25,8 @@ RUN apt-get update \ libtool \ make \ sudo \ - pkg-config + pkg-config \ + eatmydata COPY debs /debs RUN dpkg -i /debs/*.deb || apt-get --fix-broken -y install @@ -41,12 +42,17 @@ RUN rm -fr /debs # && make \ # && make install -RUN export VERSION=1.15 \ - && cd /tmp \ - && wget https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz \ - && tar -C /usr/local -xzf go$VERSION.linux-amd64.tar.gz \ - && rm -fr /go \ - && mkdir -m 0666 /go +# RUN export VERSION=1.15 \ +# && cd /tmp \ +# && wget https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz \ +# && tar -C /usr/local -xzf go$VERSION.linux-amd64.tar.gz \ +# && rm -fr /go \ +# && mkdir -m 0666 /go + +RUN eatmydata apt-get install -y golang + +RUN eatmydata apt-get install -y golang-go \ + && ln -sf /usr/lib/go-1.19 /usr/local/go ENV GOROOT=/usr/local/go ENV PATH=$PATH:$GOROOT/bin diff --git a/Dockerfile.test b/Dockerfile.test index 698ba9b..3c786e9 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,9 +1,9 @@ -FROM debian:buster +FROM debian:bookworm ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -RUN echo "deb http://archive.debian.org/debian buster-backports main" >> /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list RUN apt-get update \ && apt-get install -y \ @@ -14,7 +14,7 @@ RUN apt-get update \ bridge-utils \ net-tools \ procps \ - libboost-serialization1.71-dev \ + libboost-serialization1.74-dev \ libzmq5-dev COPY debs /debs diff --git a/dependencies.conf b/dependencies.conf index d6579c0..67c8986 100644 --- a/dependencies.conf +++ b/dependencies.conf @@ -1,14 +1,14 @@ { "branch": "master", "platform": "vs", - "debian": "buster", + "debian": "bookworm", "arch": "amd64", "dependencies": [ - "libnl-3-200_3.5.0-1", - "libnl-3-dev_3.5.0-1", - "libnl-genl-3-200_3.5.0-1", - "libnl-route-3-200_3.5.0-1", - "libnl-nf-3-200_3.5.0-1", + "libnl-3-200_3.7.0-0.2+b1sonic1", + "libnl-3-dev_3.7.0-0.2+b1sonic1", + "libnl-genl-3-200_3.7.0-0.2+b1sonic1", + "libnl-route-3-200_3.7.0-0.2+b1sonic1", + "libnl-nf-3-200_3.7.0-0.2+b1sonic1", "libyang_1.0.73", "libswsscommon_1.0.0", "libswsscommon-dev_1.0.0" From 9788aee9d442db6b5ab749616d74fcb5bfb770ca Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Sun, 14 Dec 2025 23:21:42 +0000 Subject: [PATCH 02/11] update agent pool Signed-off-by: yijingyan2 --- azurepipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurepipeline.yml b/azurepipeline.yml index 3b65ce8..31be405 100644 --- a/azurepipeline.yml +++ b/azurepipeline.yml @@ -10,7 +10,7 @@ pr: jobs: - job: Build pool: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 variables: DIFF_COVER_CHECK_THRESHOLD: 80 @@ -57,7 +57,7 @@ jobs: set -ex # Install .NET CORE curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - - sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod + sudo apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod sudo apt-get update sudo apt-get install -y dotnet-sdk-5.0 displayName: "Install .NET CORE" From 194a70d55f0093c1d65ab674cb9009ebed89db6d Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Sun, 14 Dec 2025 23:57:26 +0000 Subject: [PATCH 03/11] update redis version Signed-off-by: yijingyan2 --- test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/requirements.txt b/test/requirements.txt index 9cb98ad..3041a72 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,2 +1,2 @@ -redis==4.5.4 +redis==5.0.1 requests==2.25.0 From e901d8407b7f02bc87ed068a5864c96bdf8df040 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 00:19:39 +0000 Subject: [PATCH 04/11] update redis version Signed-off-by: yijingyan2 --- test/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/requirements.txt b/test/requirements.txt index 3041a72..0f2365d 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,2 +1,2 @@ -redis==5.0.1 +redis==6.4.0 requests==2.25.0 From 785dd0d8d8e3910a12b32c7a6606b78b07794e4b Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 02:51:01 +0000 Subject: [PATCH 05/11] set protected-mode to no Signed-off-by: yijingyan2 --- Dockerfile.test | 3 ++- test/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.test b/Dockerfile.test index 3c786e9..06ad6f8 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -27,7 +27,8 @@ RUN sed -ri 's/^(save .*$)/# \1/g; s/^logfile .*$/logfile ""/; \ s/^# syslog-enabled no$/syslog-enabled no/; \ s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/; \ - s/^bind 127.0.0.1/bind 0.0.0.0/ \ + s/^bind 127.0.0.1/bind 0.0.0.0/; \ + s/^protected-mode yes/protected-mode no/ \ ' /etc/redis/redis.conf COPY supervisor/redis.conf /etc/supervisor/conf.d/ diff --git a/test/requirements.txt b/test/requirements.txt index 0f2365d..9cb98ad 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -1,2 +1,2 @@ -redis==6.4.0 +redis==4.5.4 requests==2.25.0 From 72d5b24f857efab6b22368489cc828a86841a9b2 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 03:36:22 +0000 Subject: [PATCH 06/11] increase the sleep time to make sure the rest-api process exists before copying the coverage.cov Signed-off-by: yijingyan2 --- azurepipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurepipeline.yml b/azurepipeline.yml index 31be405..b151b16 100644 --- a/azurepipeline.yml +++ b/azurepipeline.yml @@ -41,7 +41,7 @@ jobs: pytest -vv docker exec rest-api cat /tmp/rest-api.err.log docker exec rest-api ps aux - sleep 600 + sleep 1200 cd .. docker cp rest-api:/coverage.cov ./ docker run -d --rm=true --name rest-api_build -v /tmp/target:/src -v $(pwd):/src/rest -w /src/rest rest-api-build-image tail -f /dev/null From b0b9185cab0e6069cfadb7869bb55ffe9c103a1f Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 04:07:11 +0000 Subject: [PATCH 07/11] stop rest-api Signed-off-by: yijingyan2 --- azurepipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azurepipeline.yml b/azurepipeline.yml index b151b16..ce3b178 100644 --- a/azurepipeline.yml +++ b/azurepipeline.yml @@ -41,7 +41,8 @@ jobs: pytest -vv docker exec rest-api cat /tmp/rest-api.err.log docker exec rest-api ps aux - sleep 1200 + sleep 600 + docker exec rest-api supervisorctl stop rest-api cd .. docker cp rest-api:/coverage.cov ./ docker run -d --rm=true --name rest-api_build -v /tmp/target:/src -v $(pwd):/src/rest -w /src/rest rest-api-build-image tail -f /dev/null From 0410ba0fc72354c8803b1b0f42db82860fff99a3 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 04:39:05 +0000 Subject: [PATCH 08/11] fix cover.sh Signed-off-by: yijingyan2 --- cover.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cover.sh b/cover.sh index 7bd27b4..e2ca091 100755 --- a/cover.sh +++ b/cover.sh @@ -6,5 +6,5 @@ cp -r go-server-server $GOPATH/src/go-server-server go tool cover -html=coverage.cov -o=htmlcov/coverage.html -go get github.com/t-yuki/gocover-cobertura +go install github.com/t-yuki/gocover-cobertura@latest $GOPATH/bin/gocover-cobertura < coverage.cov > coverage.xml From 8738bfe0eea714b56826f76929a3719ae7c1fd31 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 05:05:39 +0000 Subject: [PATCH 09/11] update dotnet version Signed-off-by: yijingyan2 --- azurepipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurepipeline.yml b/azurepipeline.yml index ce3b178..aa91c30 100644 --- a/azurepipeline.yml +++ b/azurepipeline.yml @@ -60,7 +60,7 @@ jobs: curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - sudo apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod sudo apt-get update - sudo apt-get install -y dotnet-sdk-5.0 + sudo apt-get install -y dotnet-sdk-8.0 displayName: "Install .NET CORE" - task: PublishCodeCoverageResults@1 From 88cc1d5fb978fae6ea77e8a38d159217557c6401 Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 05:52:53 +0000 Subject: [PATCH 10/11] remove unnecessary code Signed-off-by: yijingyan2 --- Dockerfile.build | 9 +-------- Dockerfile.test | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 361331a..03b4032 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -3,7 +3,7 @@ FROM debian:bookworm ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -RUN echo "deb http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bookworm" >> /etc/apt/sources.list RUN apt-get update \ && apt-get install -y \ @@ -42,13 +42,6 @@ RUN rm -fr /debs # && make \ # && make install -# RUN export VERSION=1.15 \ -# && cd /tmp \ -# && wget https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz \ -# && tar -C /usr/local -xzf go$VERSION.linux-amd64.tar.gz \ -# && rm -fr /go \ -# && mkdir -m 0666 /go - RUN eatmydata apt-get install -y golang RUN eatmydata apt-get install -y golang-go \ diff --git a/Dockerfile.test b/Dockerfile.test index 06ad6f8..f950b24 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -3,7 +3,7 @@ FROM debian:bookworm ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -RUN echo "deb http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list +RUN echo "deb http://deb.debian.org/debian bookworm" >> /etc/apt/sources.list RUN apt-get update \ && apt-get install -y \ From 48429b88b6921bb6d7646d704251036db531616d Mon Sep 17 00:00:00 2001 From: yijingyan2 Date: Mon, 15 Dec 2025 06:16:47 +0000 Subject: [PATCH 11/11] clean code Signed-off-by: yijingyan2 --- Dockerfile.build | 2 -- Dockerfile.test | 2 -- 2 files changed, 4 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 03b4032..e8f38db 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -3,8 +3,6 @@ FROM debian:bookworm ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -RUN echo "deb http://deb.debian.org/debian bookworm" >> /etc/apt/sources.list - RUN apt-get update \ && apt-get install -y \ wget \ diff --git a/Dockerfile.test b/Dockerfile.test index f950b24..7a85601 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -3,8 +3,6 @@ FROM debian:bookworm ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive -RUN echo "deb http://deb.debian.org/debian bookworm" >> /etc/apt/sources.list - RUN apt-get update \ && apt-get install -y \ vim \