Skip to content

Commit

Permalink
updated hive to latest mce-2.4 commit (#535)
Browse files Browse the repository at this point in the history
Signed-off-by: Disaiah Bennett <[email protected]>
  • Loading branch information
dislbenn authored Oct 11, 2023
1 parent 35604b0 commit b054155
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 4 additions & 2 deletions hack/bundle-automation/config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
- repo_name: generate-hive-bundle
gen_command: ./hack/bundle-automation/gen-hive-bundle.sh
branch: mce-2.4
sha: 4418e43e27a3bffdac6192a0c4a5f581146f5d00
sha: bcbe8574a970871399b30127082c6d2e8185e866
bundlePath: /tmp/hive-operator-manifests
name: hive-operator
imageMappings:
hive: openshift_hive
hive: openshift_hive
imageRepoOverride: stolostron
imageTagOverride: 2.4-bcbe8574a970871399b30127082c6d2e8185e866

- repo_name: "community-operators-prod"
github_ref: "https://github.com/redhat-openshift-ecosystem/community-operators-prod.git"
Expand Down
4 changes: 3 additions & 1 deletion hack/bundle-automation/gen-hive-bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ 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
Expand Down Expand Up @@ -64,7 +66,7 @@ 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"
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"
# 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=$?
Expand Down
6 changes: 5 additions & 1 deletion hack/bundle-automation/generate-bundles.py
Original file line number Diff line number Diff line change
Expand Up @@ -723,10 +723,14 @@ 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" % (repo["gen_command"], branch, sha, bundlePath)
cmd = "%s %s %s %s %s %s" % (repo["gen_command"], branch, sha, bundlePath, imageRepoOverride, imageTagOverride)

logging.info("Running bundle-gen tool: %s", cmd)
rc = os.system(cmd)
if rc != 0:
Expand Down

0 comments on commit b054155

Please sign in to comment.