From 87dd4fc10073da306c30acdb9dbdd070e9885283 Mon Sep 17 00:00:00 2001 From: Giulia Naponiello Date: Aug 15 2018 09:24:23 +0000 Subject: Greenwave conf and support for gating validation rpkg will validate the gating.yaml file if there is one in the repo. It will ask to Greenwave for that, when a build command is issued. The command will fail if the gating.yaml file is misconfigured. The user will have the chance to disable the check adding a parameter. With this change fedpkg will have the default configuration to query the Greenwave API. Signed-off-by: Giulia Naponiello --- diff --git a/conf/bash-completion/fedpkg.bash b/conf/bash-completion/fedpkg.bash index baa5491..c028271 100644 --- a/conf/bash-completion/fedpkg.bash +++ b/conf/bash-completion/fedpkg.bash @@ -94,7 +94,7 @@ _fedpkg() help|gimmespec|gitbuildhash|giturl|lint|new|push|unused-patches|update|verrel) ;; build) - options="--nowait --background --skip-tag --scratch" + options="--nowait --background --skip-tag --scratch --skip-remote-rules-validation" options_arches="--arches" options_srpm="--srpm" options_target="--target" @@ -129,7 +129,7 @@ _fedpkg() options_dir="--builddir" ;; container-build) - options="--scratch --nowait --repo-url" + options="--scratch --nowait --repo-url --skip-remote-rules-validation" options_arches="--arches" options_target="--target" ;; diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf index 7d0400c..38b2a59 100644 --- a/conf/etc/rpkg/fedpkg-stage.conf +++ b/conf/etc/rpkg/fedpkg-stage.conf @@ -43,3 +43,6 @@ url = https://stg.pagure.io/ [fedpkg-stage.pdc] url = https://pdc.stg.fedoraproject.org/ + +[fedpkg-stage.greenwave] +url = https://greenwave.stg.fedoraproject.org/ diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf index 52c69fc..1333865 100644 --- a/conf/etc/rpkg/fedpkg.conf +++ b/conf/etc/rpkg/fedpkg.conf @@ -44,3 +44,6 @@ url = https://pagure.io/ [fedpkg.pdc] url = https://pdc.fedoraproject.org/ + +[fedpkg.greenwave] +url = https://greenwave.fedoraproject.org/ diff --git a/conf/zsh-completion/_fedpkg b/conf/zsh-completion/_fedpkg index 054bf7e..8c39654 100644 --- a/conf/zsh-completion/_fedpkg +++ b/conf/zsh-completion/_fedpkg @@ -63,7 +63,8 @@ _fedpkg-build () { '--background[run the build at a low priority]' \ '--skip-tag[do not attempt to tag package]' \ '--scratch[perform a scratch build]' \ - '--srpm[build from an srpm]::srpm:_files -g "*.src.rpm"' + '--srpm[build from an srpm]::srpm:_files -g "*.src.rpm"' \ + '--skip-remote-rules-validation[don'\''t check gating.yaml policies]' } (( $+functions[_fedpkg-chain-build] )) ||