diff --git a/.github/workflows/cni-plugin-integration.yml b/.github/workflows/cni-plugin-integration.yml index 95823c09..3a7fcd93 100644 --- a/.github/workflows/cni-plugin-integration.yml +++ b/.github/workflows/cni-plugin-integration.yml @@ -42,4 +42,23 @@ jobs: - uses: linkerd/dev/actions/setup-tools@v45 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Run repair-controller tests - run: just cni-repair-controller-integration + run: | + set -xeuo pipefail + echo $? + #apt list --installed + sudo apt-get install -y clang-19 + echo $? + #ls -l /usr/lib/llvm* + just cni-repair-controller-integration + echo $? + repair-controller-old-ubuntu: + timeout-minutes: 15 + runs-on: ubuntu-22.04 + #container: ghcr.io/linkerd/dev:v45-rust + steps: + - uses: linkerd/dev/actions/setup-rust@v45 + - uses: linkerd/dev/actions/setup-tools@v45 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - name: Run repair-controller tests + run: | + just cni-repair-controller-integration diff --git a/Dockerfile-cni-plugin b/Dockerfile-cni-plugin index 18ebadd4..5dcf935d 100644 --- a/Dockerfile-cni-plugin +++ b/Dockerfile-cni-plugin @@ -12,7 +12,7 @@ ARG TARGETARCH RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \ go build -o /go/bin/linkerd-cni -mod=readonly -ldflags "-s -w" -v ./cni-plugin/ -FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v44-rust-musl as cni-repair-controller +FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v45-rust-musl as cni-repair-controller WORKDIR /build COPY --link justfile justfile-rust . COPY --link Cargo.toml Cargo.lock .