From a34442820e21ffa5940ff2ee166d764e1747d424 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 15 Jun 2026 16:53:23 -0400 Subject: [PATCH 1/2] run.sh: Add option for koji-profile This will allow us to select the production or staging environments. In the future, this will also be passed to `elnbuildsync`, but for now it will only be used for checking that Koji is accessible. Signed-off-by: Stephen Gallagher --- run.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 2a35553..61dccd8 100755 --- a/run.sh +++ b/run.sh @@ -24,6 +24,7 @@ # ARG_OPTIONAL_SINGLE([config-url],[],[Configuration Git URL],[https://github.com/fedora-eln/elnbuildsync-config.git]) # ARG_OPTIONAL_SINGLE([config-branch],[],[Configuration Git branch],[main]) # ARG_OPTIONAL_SINGLE([keytab-principal],[],[Keytab principal],[eln-buildsync@FEDORAPROJECT.ORG]) +# ARG_OPTIONAL_SINGLE([koji-profile],[],[Koji profile],[koji]) # ARG_POSITIONAL_DOUBLEDASH([]) # ARG_POSITIONAL_INF([custom],[Additional arguments to pass to the ELNBuildSync daemon]) # ARG_HELP([],[Run the ELNBuildSync daemon]) @@ -59,17 +60,19 @@ _arg_config_file= _arg_config_url="https://github.com/fedora-eln/elnbuildsync-config.git" _arg_config_branch="main" _arg_keytab_principal="eln-buildsync@FEDORAPROJECT.ORG" +_arg_koji_profile="koji" print_help() { - printf 'Usage: %s [--log-level ] [--config-file ] [--config-url ] [--config-branch ] [--keytab-principal ] [-h|--help] [--] [] ... [] ...\n' "$0" + printf 'Usage: %s [--log-level ] [--config-file ] [--config-url ] [--config-branch ] [--keytab-principal ] [--koji-profile ] [-h|--help] [--] [] ... [] ...\n' "$0" printf '\t%s\n' ": Additional arguments to pass to the ELNBuildSync daemon" printf '\t%s\n' "--log-level: Log verbosity (default: 'INFO')" printf '\t%s\n' "--config-file: Configuration file (no default)" printf '\t%s\n' "--config-url: Configuration Git URL (default: 'https://github.com/fedora-eln/elnbuildsync-config.git')" printf '\t%s\n' "--config-branch: Configuration Git branch (default: 'main')" printf '\t%s\n' "--keytab-principal: Keytab principal (default: 'eln-buildsync@FEDORAPROJECT.ORG')" + printf '\t%s\n' "--koji-profile: Koji profile (default: 'koji')" printf '\t%s\n' "-h, --help: Prints help" printf '\n%s\n' "Run the ELNBuildSync daemon" } @@ -133,6 +136,14 @@ parse_commandline() --keytab-principal=*) _arg_keytab_principal="${_key##--keytab-principal=}" ;; + --koji-profile) + test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1 + _arg_koji_profile="$2" + shift + ;; + --koji-profile=*) + _arg_koji_profile="${_key##--koji-profile=}" + ;; -h|--help) print_help exit 0 @@ -196,7 +207,7 @@ fi # Make sure Kerberos is working by trying to connect to koji while true; do - koji hello && break || sleep 1 + koji -p ${_arg_koji_profile} hello && break || sleep 3 done if [ -f /etc/elnbuildsync/elnbuildsync_config.yaml ]; then From 4e6dba206350336b8eff2b73e2814369bb05e8c1 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 15 Jun 2026 16:54:48 -0400 Subject: [PATCH 2/2] Bump patch release Signed-off-by: Stephen Gallagher --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9b55235..4d110b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "ELNBuildSync" -version = "1.1.1" +version = "1.1.2" authors = [ { name = "Stephen Gallagher", email = "sgallagh@redhat.com" }, ]