Skip to content

refactor: drop support for building discovery-installer #16

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

Merged
infinitewarp merged 1 commit into from
Mar 26, 2026
Merged

refactor: drop support for building discovery-installer #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions discobuilder/builder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from discobuilder.adapter.git import configure_git
from discobuilder.adapter.kerberos import kinit
from discobuilder.builder.cli import build_cli # noqa: F401
from discobuilder.builder.installer import build_installer # noqa: F401
from discobuilder.builder.ctl import build_ctl # noqa: F401


Expand All @@ -14,7 +13,7 @@ def build():
while True:
choice = Prompt.ask(
"What do you want to build?",
choices=["cli", "installer", "ctl"],
choices=["cli", "ctl"],
default="cli",
)
eval(f"build_{choice}()")
Expand Down
1 change: 0 additions & 1 deletion discobuilder/builder/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# TODO: Refactor/deduplicate a lot of similar code between this and ./installer.py.
from textwrap import dedent

import re
Expand Down
193 changes: 0 additions & 193 deletions discobuilder/builder/installer.py
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions discobuilder/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,6 @@
DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_PREFIX = environ.get(
"DISCOVERY_CLI_GIT_REMOTE_RELEASE_BRANCH_PREFIX", "remotes/origin/discovery-2-"
)
# discovery-installer is downstream repo for packaging quipucords-installer
DISCOVERY_INSTALLER_GIT_URL = environ.get(
"DISCOVERY_INSTALLER_GIT_URL",
"ssh://{username}@pkgs.devel.redhat.com/rpms/discovery-installer.git",
) # see also: https://pkgs.devel.redhat.com/cgit/rpms/discovery-installer
QUIPUCORDS_INSTALLER_SPEC_URL = environ.get(
"DISCOVERY_INSTALLER_UPSTREAM_SPEC_URL",
(
"https://raw.githubusercontent.com/quipucords/quipucords-installer/"
"{0}/quipucords-installer.spec"
),
)
DISCOVERY_INSTALLER_GIT_REPO_PATH = environ.get(
"DISCOVERY_INSTALLER_GIT_REPO_PATH", "/repos/discovery-installer"
)
DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_DEFAULT = environ.get(
"DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_DEFAULT",
"remotes/origin/discovery-2-rhel-9",
)
DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_PREFIX = environ.get(
"DISCOVERY_INSTALLER_GIT_REMOTE_RELEASE_BRANCH_PREFIX", "remotes/origin/discovery-"
)
# discoveryctl is downstream repo for packaging quipucordsctl
DISCOVERY_CTL_GIT_URL = environ.get(
"DISCOVERY_CTL_GIT_URL",
Expand Down
2 changes: 0 additions & 2 deletions scripts/helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ export GIT_SIGNINGKEY
export KERBEROS_USERNAME
export DISCOVERY_CLI_GIT_URL
export DISCOVERY_CLI_GIT_REPO_PATH
export DISCOVERY_INSTALLER_GIT_URL
export DISCOVERY_INSTALLER_GIT_REPO_PATH
export VERBOSE_SUBPROCESSES

mkdir -p ~/.ssh
Expand Down
Loading