From 55583467043553a3aae8ca8eb79ed6258740422e Mon Sep 17 00:00:00 2001 From: Aswin Suryanarayanan Date: Thu, 18 Jan 2024 17:27:36 -0500 Subject: [PATCH] Update OVN Image and commit OVN now builds and pushes image with every commit. So changed to use OVN Image than buildng locally. Added pip to shipyard-dapper-base as it is required for kind.sh to set up the Jinja2 tools Signed-off-by: Aswin Suryanarayanan --- package/Dockerfile.shipyard-dapper-base | 2 +- scripts/shared/lib/clusters_kind | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package/Dockerfile.shipyard-dapper-base b/package/Dockerfile.shipyard-dapper-base index 42988e488..ea1cf54a9 100644 --- a/package/Dockerfile.shipyard-dapper-base +++ b/package/Dockerfile.shipyard-dapper-base @@ -44,7 +44,7 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.l # - Any unnecessary packages and executables RUN dnf -y install --nodocs --setopt=install_weak_deps=False \ gcc git-core curl moby-engine make golang kubernetes-client \ - findutils moreutils upx jq gitlint procps-ng \ + findutils moreutils upx jq gitlint procps-ng pip\ qemu-user-static python3-jinja2-cli skopeo file unzip gh && \ rpm -e --nodeps containerd && \ rpm -qa "selinux*" | xargs -r rpm -e --nodeps && \ diff --git a/scripts/shared/lib/clusters_kind b/scripts/shared/lib/clusters_kind index 9fa282503..bcf44af80 100755 --- a/scripts/shared/lib/clusters_kind +++ b/scripts/shared/lib/clusters_kind @@ -243,20 +243,16 @@ function provider_failed() { function prepare_ovn() { export OVN_IMAGE="localhost:5000/ovn-daemonset-f:latest" - echo "Building ovn-kubernetes with interconnect (OVN-IC) from source" - echo "This will become unnecessary if OVN CI image publishing is fixed" - echo "https://github.com/ovn-org/ovn-kubernetes/actions/workflows/docker.yml" rm -rf ovn-kubernetes git clone https://github.com/ovn-org/ovn-kubernetes pushd ovn-kubernetes || exit - git checkout d462cf088c44ff501e5fcf746e9163193afa2dc4 - make -C go-controller + # When updating commit, Update the OVN_SRC_IMAGE to the corressponding commit + git checkout 24b0ae73a996e409bfefad7b90cb42224e34be54 + local OVN_SRC_IMAGE="ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-u:master@sha256:ba102783d520f0474e5c7dd5f2a0a1dce0ec2bda6cd42ac547621892e57c25e2" - cp go-controller/_output/go/bin/* dist/images - - echo "ref: $(git rev-parse --symbolic-full-name HEAD) commit: $(git rev-parse HEAD)" > dist/images/git_info - docker build -t "${OVN_IMAGE}" -f dist/images/Dockerfile.fedora dist/images/ + docker pull "${OVN_SRC_IMAGE}" + docker tag "${OVN_SRC_IMAGE}" "${OVN_IMAGE}" docker push "${OVN_IMAGE}" popd || exit