Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACM-7785] Updated Hive commit to latest mce-2.4 #543

Closed
wants to merge 4 commits into from
Closed

[ACM-7785] Updated Hive commit to latest mce-2.4 #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
385d0a5
updated hive image-repo ref in hack config
dislbenn Oct 12, 2023
478dad8
Adjust hack to prevent Hive's gen tool from doing image validation
joeg-pro Oct 18, 2023
261139d
Merge branch 'update-hive-config' into hive-mce-2.4
dislbenn Oct 19, 2023
d09afff
updated hive commit to latest mce-2.4
dislbenn Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions hack/bundle-automation/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
7 changes: 4 additions & 3 deletions hack/bundle-automation/gen-hive-bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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=$?
Expand Down
4 changes: 1 addition & 3 deletions hack/bundle-automation/generate-bundles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading