[ACM-7785] Updated hive image-repo ref in hack config (#538)

* updated hive image-repo ref in hack config Signed-off-by: Disaiah Bennett <[email protected]> * Adjust hack to prevent Hive's gen tool from doing image validation Signed-off-by: Joe Gdaniec <[email protected]> * updated hive commit to latest mce-2.4 Signed-off-by: Disaiah Bennett <[email protected]> --------- Signed-off-by: Disaiah Bennett <[email protected]> Signed-off-by: Joe Gdaniec <[email protected]> Co-authored-by: Joe Gdaniec <[email protected]>
stolostron · Oct 19, 2023 · 526ed59 · 526ed59
1 parent b0f7b06
commit 526ed59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/hack/bundle-automation/config.yaml b/hack/bundle-automation/config.yaml
@@ -1,14 +1,11 @@
 - repo_name: generate-hive-bundle
   gen_command: ./hack/bundle-automation/gen-hive-bundle.sh
   branch: mce-2.4
-  sha: 30c82d3f1a0ef1edaedcbed9d92b840732ad2e75
+  sha: e3f9aed5bf2a2b43aa05621864fd37c71c38afda
   bundlePath: /tmp/hive-operator-manifests
   name: hive-operator
   imageMappings:
     hive: openshift_hive
-    stolostron: openshift_hive
-  imageRepoOverride: stolostron
-  imageTagOverride: 2.4-local-30c82d3f1a0ef1edaedcbed9d92b840732ad2e75
 
 - repo_name: "community-operators-prod"
   github_ref: "https://github.com/redhat-openshift-ecosystem/community-operators-prod.git"

diff --git a/hack/bundle-automation/gen-hive-bundle.sh b/hack/bundle-automation/gen-hive-bundle.sh
@@ -16,8 +16,7 @@ me=$(basename "$0")
 branch="$1"
 commit_ish="$2"
 output_dir="$3"
-image_repo="$4"
-image_tag_override="$5"
+
 if [[ -z "$output_dir" ]]; then
    >&2 echo "Syntax: $me <commit_ish> <output_path>"
    exit 5
@@ -66,7 +65,9 @@ fi
 mkdir bundle
 cd bundle
 echo "Running Hive bundle-gen tool ($gen_tool)."
-python3 ../hive/$gen_tool --hive-repo "$hive_repo_spot" --commit "$commit_ish" --dummy-bundle "$branch" --image-repo "$image_repo" --image-tag-override "$image_tag_override"
+python3 ../hive/$gen_tool --hive-repo "$hive_repo_spot" --commit "$commit_ish" --dummy-bundle "$branch" \
+   --image-repo dummy.io/disable-image-validation/hive
+
 # Note: We point the bundle-gen tool at the local repo we already checked out
 # since we know that it contains the Git SHA we are using for input.
 rc=$?

diff --git a/hack/bundle-automation/generate-bundles.py b/hack/bundle-automation/generate-bundles.py
@@ -723,13 +723,11 @@ def main():
                 branch = repo["branch"]
                 sha = repo["sha"]
                 bundlePath = repo["bundlePath"]
-                imageRepoOverride = repo["imageRepoOverride"]
-                imageTagOverride = repo["imageTagOverride"]
 
             except KeyError:
                 logging.critical("branch and bundlePath are required for tool-generated bundles")
                 exit(1)
-            cmd = "%s %s %s %s %s %s" % (repo["gen_command"], branch, sha, bundlePath, imageRepoOverride, imageTagOverride)
+            cmd = "%s %s %s %s" % (repo["gen_command"], branch, sha, bundlePath)
 
             logging.info("Running bundle-gen tool: %s", cmd)
             rc = os.system(cmd)