David Caro has uploaded a new change for review. Change subject: Refactored the shellscript options ......................................................................
Refactored the shellscript options Now the shell scripts use the following options: * srcrpm-req-packages: Packages required to build the srcrpm * srcrpm-rpmbuild-options: extra options for the rpmbuild command executed when creating the srcrpm * autogen-options: extra options to pass to the autogen.sh command * configure-options: extra options to pass to the ./configure command * buildsh-options: extra options to pass to the build.sh command * rpm-req-packages: packages required to build the rpm (ideally should be empty, pulled in by the srcrpm BuildRequires fields) * rpm-rpmbuild-options: extra options to pass to the rpmbuild command when building the binary rpm Change-Id: Ic0d98f9d773070f0585f156ec757f834ca2391e4 Signed-off-by: David Caro <[email protected]> --- M jobs/confs/shell-scripts/build_local_srcrpm.sh M jobs/confs/shell-scripts/build_mock_srcrpm.sh M jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh M jobs/confs/shell-scripts/mock_build_onlyrpm.sh M jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml M jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml M jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml M jobs/confs/yaml/jobs/slf4j/slf4j.yaml M jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml M jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml M jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml M jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml M jobs/confs/yaml/templates/create-rpms_mock.yaml M jobs/confs/yaml/templates/install-rpm-sanity.yaml 16 files changed, 93 insertions(+), 94 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/64/33764/1 diff --git a/jobs/confs/shell-scripts/build_local_srcrpm.sh b/jobs/confs/shell-scripts/build_local_srcrpm.sh index 8ea4d63..c199233 100644 --- a/jobs/confs/shell-scripts/build_local_srcrpm.sh +++ b/jobs/confs/shell-scripts/build_local_srcrpm.sh @@ -6,13 +6,13 @@ # Name of the project it runs on, specifically the dir where the code # has been cloned # -# extra-configure-options +# configure-options # extra options to pass to configure # -# extra-autogen-options +# autogen-options # extra options to pass to autogen # -# extra-rpmbuild-options +# src-rpmbuild-options # extra options to pass to rpmbuild as defines, as a spaceseparated list # of key=value pairs # @@ -20,9 +20,9 @@ # extra env variables to set when building project="{project}" -extra_configure_options=({extra-configure-options}) -extra_autogen_options=({extra-autogen-options}) -extra_rpmbuild_options=({extra-rpmbuild-options}) +configure_options=({configure-options}) +autogen_options=({autogen-options}) +src_rpmbuild_options=({src-rpmbuild-options}) extra_env="{env}" WORKSPACE=$PWD @@ -38,10 +38,10 @@ git clean -dxf # build tarballs if [[ -x autogen.sh ]]; then - ./autogen.sh --system "${{extra_autogen_options[@]}}" + ./autogen.sh --system "${{autogen_options[@]}}" fi if [[ -x configure ]]; then - ./configure "${{extra_configure_options[@]}}" + ./configure "${{configure_options[@]}}" fi make dist mv *.tar.gz "$WORKSPACE"/exported-artifacts/ @@ -49,7 +49,7 @@ ## build src.rpm rpmbuild_options=("-D" "release_suffix ${{suffix}}") -for option in $extra_rpmbuild_options; do +for option in $src_rpmbuild_options; do rpmbuild_options+=("-D" "${{option//=/ }}") done rpmbuild \ diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm.sh b/jobs/confs/shell-scripts/build_mock_srcrpm.sh index 3b80805..fd31f97 100644 --- a/jobs/confs/shell-scripts/build_mock_srcrpm.sh +++ b/jobs/confs/shell-scripts/build_mock_srcrpm.sh @@ -13,20 +13,17 @@ # arch # Architecture to build the packages for # -# extra-build-packages +# srcrpm-req-packages # space separated list of extra packages to install, as you would pass to # yum # -# extra-build-options -# space separated list of extra options to pass to the build.sh script -# -# extra-configure-options +# configure-options # space separated list of extra options to pass to the configure script # -# extra-autogen-options +# autogen-options # space separated list of extra options to pass to the autogen.sh script # -# extra-rpmbuild-options +# srcrpm-rpmbuild-options # extra options to pass to rpmbuild as defines, as a spaceseparated list # of key=value pairs # @@ -40,11 +37,10 @@ distro="{distro}" arch="{arch}" project="{project}" -extra_build_options=({extra-build-options}) -extra_configure_options=({extra-configure-options}) -extra_autogen_options=({extra-autogen-options}) -extra_rpmbuild_options=({extra-rpmbuild-options}) -extra_build_packages=({extra-build-packages}) +configure_options=({configure-options}) +autogen_options=({autogen-options}) +srcrpm_rpmbuild_options=({extra-rpmbuild-options}) +srcrpm_req_packages=({srcrpm-req-packages}) extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD @@ -55,14 +51,17 @@ echo "suffix='${{suffix}}'" > "$WORKSPACE/tmp/rpm_suffix.inc" ### Generate the mock configuration -rpmbuild_options=("-D" "release_suffix ${{suffix}}") mock_build_options=("--define" "release_suffix ${{suffix}}") -for option in $extra_rpmbuild_options; do +if [[ -n ${{suffix}} ]]; then + rpmbuild_options=("-D" "release_suffix ${{suffix}}") +else + rpmbuild_options=() +fi +for option in $srcrpm_rpmbuild_options; do rpmbuild_options+=("-D" "${{option//=/ }}") mock_build_options+=("--define" "${{option//=/ }}") done pushd "$WORKSPACE"/jenkins/mock_configs -arch="{arch}" case $distro in fc*) distribution="fedora-${{distro#fc}}";; el*) distribution="epel-${{distro#el}}";; @@ -112,11 +111,11 @@ EOF ### Install any extra packages if needed -if [[ -n "$extra_build_packages" ]]; then - echo "##### Installing extra dependencies: $extra_packages" +if [[ -n "$srcrpm_req_packages" ]]; then + echo "##### Installing extra dependencies: ${{srcrpm_req_packages[@]}}" $my_mock \ --no-clean \ - --install "${{extra_build_packages[@]}}" + --install "${{srcrpm_req_packages[@]}}" fi @@ -148,22 +147,14 @@ --copyin "$WORKSPACE"/$project /tmp/$project echo "##### Building the srpms" -if [[ -n ${{suffix}} ]]; then - rpmbuild_options=("-D" "release_suffix ${{suffix}}") -else - rpmbuild_options=() -fi -for option in "${{extra_rpmbuild_options[@]}}"; do - rpmbuild_options+=("-D" "${{option//=/ }}") -done $my_mock \ --no-clean \ --shell <<EOF set -e cd /tmp/$project # build tarballs -./autogen.sh --system "${{extra_autogen_options[@]}}" -./configure "${{extra_configure_options[@]}}" +./autogen.sh --system "${{autogen_options[@]}}" +./configure "${{configure_options[@]}}" make dist # build src.rpm diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh b/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh index 8f68b71..931efe1 100644 --- a/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh +++ b/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh @@ -16,14 +16,14 @@ # arch # Architecture to build the packages for # -# extra-build-packages +# srcrpm-req-packages # space separated list of extra packages to install, as you would pass to # yum # -# extra-build-options +# buildsh-options # space separated list of extra options to pass to the build.sh script # -# extra-rpmbuild-options +# srcrpm-rpmbuild-options # extra options to pass to rpmbuild as defines, as a space separated list # of key=value pairs # @@ -38,22 +38,22 @@ arch="{arch}" project="{project}" subproject="{subproject}" -extra_build_packages=({extra-build-packages}) -extra_build_options=({extra-build-options}) -extra_rpmbuild_options=({extra-rpmbuild-options}) +srcrpm_req_packages=({srcrpm-req-packages}) +buildsh_options=({buildsh-options}) +srcrpm_rpmbuild_options=({srcrpm-rpmbuild-options}) extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD -### Generate the mock configuration +### Add rpmbuild options rpmbuild_options=("-D" "release_suffix ${{suffix}}") mock_build_options=("--define" "release_suffix ${{suffix}}") -for option in $extra_rpmbuild_options; do +for option in $srcrpm_rpmbuild_options; do rpmbuild_options+=("-D" "${{option//=/ }}") mock_build_options+=("--define" "${{option//=/ }}") done -pushd "$WORKSPACE"/jenkins/mock_configs +### Get the mock configfile name arch="{arch}" case $distro in fc*) distribution="fedora-${{distro#fc}}";; @@ -61,6 +61,7 @@ *) echo "Unknown distro $distro"; exit 1;; esac mock_conf="${{distribution}}-$arch-custom" +### Add the extra repos if any mock_repos='' for mock_repo in "${{extra_repos[@]}}"; do mock_repos+=" --repo=$mock_repo" @@ -70,7 +71,9 @@ for env_opt in "${{extra_env[@]}}"; do mock_envs+=" --option=environment.$env_opt" done +### Generate the config file echo "#### Generating mock configuration" +pushd "$WORKSPACE"/jenkins/mock_configs ./mock_genconfig \ --name="$mock_conf" \ --base="$distribution-$arch.cfg" \ @@ -78,6 +81,7 @@ $mock_repos \ $mock_envs \ > "$mock_conf.cfg" +### Update the cache mtime as we just regenerated the config file sudo touch /var/cache/mock/*/root_cache/cache.tar.gz || : cat "$mock_conf.cfg" popd @@ -104,11 +108,11 @@ EOF ### Install any extra packages if needed -if [[ -n "$extra_build_packages" ]]; then - echo "##### Installing extra dependencies: $extra_packages" +if [[ -n "$srcrpm_req_packages" ]]; then + echo "##### Installing extra dependencies: ${{srcrpm_req_packages[@]}}" $my_mock \ --no-clean \ - --install "${{extra_build_packages[@]}}" + --install "${{srcrpm_req_packages[@]}}" fi ### Set custom dist from mock config into rpmmacros for manual builds @@ -132,7 +136,7 @@ --no-clean \ --shell <<EOF cd /tmp/$subproject -./build.sh "${{extra_build_options[@]}}" +./build.sh "${{buildsh_options[@]}}" mkdir /tmp/SRCRPMS mv *src.rpm /tmp/SRCRPMS/ EOF diff --git a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh index 083d6df..44ac107 100644 --- a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh +++ b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh @@ -13,11 +13,11 @@ # arch # Architecture to build the packages for # -# extra-packages +# rpm-req-packages # space separated list of extra packages to install, as you would pass to # yum # -# extra-rpmbuild-options +# rpm-rpmbuild-options # extra options to pass to rpmbuild as defines, as a space separated list # of key=value pairs # @@ -31,8 +31,8 @@ distro="{distro}" arch="{arch}" project="{project}" -extra_packages=({extra-packages}) -extra_rpmbuild_options=({extra-rpmbuild-options}) +rpm_req_packages=({rpm-req-packages}) +rpm_rpmbuild_options=({rpm-rpmbuild-options}) extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD @@ -48,7 +48,7 @@ rpmbuild_options+=("-D" "release_suffix ${{suffix}}") mock_build_options+=("--define" "release_suffix ${{suffix}}") fi -for option in $extra_rpmbuild_options; do +for option in $rpm_rpmbuild_options; do rpmbuild_options+=("-D" "${{option//=/ }}") mock_build_options+=("--define" "${{option//=/ }}") done @@ -104,11 +104,11 @@ EOF ### Install any extra packages if needed -if [[ -n "$extra_packages" ]]; then - echo "##### Installing extra dependencies: $extra_packages" +if [[ -n "$rpm_req_packages" ]]; then + echo "##### Installing extra dependencies: $rpm_req_packages" $my_mock \ --no-clean \ - --install "${{extra_packages[@]}}" + --install "${{rpm_req_packages[@]}}" fi ### Set custom dist from mock config into rpmmacros for manual builds diff --git a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml index 361a4c1..6387b92 100644 --- a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml @@ -19,7 +19,7 @@ - x86_64 jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-build-packages: | + srcrpm-req-packages: | autoreconf gettext-devel automake diff --git a/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml b/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml index 1816b99..bf283dd 100644 --- a/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/kexec-tools/kexec-tools_create-rpms.yaml @@ -14,11 +14,12 @@ - all distro: - el6: - extra-build-options: el6 + buildsh-options: el6 - el7: - extra-build-options: el7 + buildsh-options: el7 arch: - x86_64 jobs: - '{subproject}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-build-packages: 'wget' + srcrpm-req-packages: | + 'wget' diff --git a/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml b/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml index c3c783f..8c65075 100644 --- a/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml @@ -19,7 +19,7 @@ - x86_64 jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-build-packages: | + srcrpm-req-packages: | autoreconf gettext-devel automake diff --git a/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml index 0c1b6a5..04dc8d4 100644 --- a/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-hosted-engine-ha/ovirt-hosted-engine-ha_create-rpms.yaml @@ -20,7 +20,7 @@ - x86_64 jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-configure-options: | + configure-options: | --prefix=/usr \ --exec_prefix=/usr \ --sysconfdir=/etc \ @@ -49,7 +49,7 @@ - x86_64 jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-configure-options: | + configure-options: | --prefix=/usr \ --exec_prefix=/usr \ --sysconfdir=/etc \ @@ -80,7 +80,7 @@ - x86_64 jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-configure-options: | + configure-options: | --prefix=/usr \ --exec_prefix=/usr \ --sysconfdir=/etc \ diff --git a/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml index 98d8278..d96b482 100644 --- a/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-hosted-engine-setup/ovirt-hosted-engine-setup_create-rpms.yaml @@ -14,7 +14,7 @@ distro: - fc20 - el6: - extra-build-packages: | + srcrpm-req-packages: | otopi-devtools autoconf gettext-devel @@ -42,7 +42,7 @@ - fc19 - fc20 - el6: - extra-build-packages: | + srcrpm-req-packages: | otopi-devtools autoconf gettext-devel @@ -65,7 +65,7 @@ extra-repos: | ovirt-3.4-snapshot,http://resources.ovirt.org/pub/ovirt-3.4-snapshot/rpm/$distro ovirt-3.4-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.4-snapshot-static/rpm/$distro - extra-build-packages: | + srcrpm-req-packages: | otopi-devtools autoreconf gettext-devel @@ -76,7 +76,7 @@ - fc19 - fc20 - el6: - extra-build-packages: | + srcrpm-req-packages: | otopi-devtools autoconf gettext-devel diff --git a/jobs/confs/yaml/jobs/slf4j/slf4j.yaml b/jobs/confs/yaml/jobs/slf4j/slf4j.yaml index fbce791..612261b 100644 --- a/jobs/confs/yaml/jobs/slf4j/slf4j.yaml +++ b/jobs/confs/yaml/jobs/slf4j/slf4j.yaml @@ -15,10 +15,11 @@ distro: - el6: extra-repos: ci-tools,http://resources.ovirt.org/repos/ci-tools/el6 - extra-packages: maven3 + rpm-req-packages: | + maven3 arch: - x86_64 jobs: - '{subproject}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-build-packages: | + srcrpm-req-packages: | rpmdevtools diff --git a/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml b/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml index 3fe0d70..e1a97bf 100644 --- a/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/unboundid-ldapsdk/unboundid-ldapsdk_create-rpms.yaml @@ -21,4 +21,4 @@ - x86_64 jobs: - '{subproject}_{version}_create-rpms-{distro}-{arch}_{trigger}': - extra-build-packages: 'svn' + srcrpm-req-packages: 'svn' diff --git a/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml b/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml index 7aa424d..c24cd26 100644 --- a/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/vdsm-jsonrpc-java/vdsm-jsonrpc-java_create-rpms.yaml @@ -15,7 +15,7 @@ - el6: extra-repos: | ci-tools,http://resources.ovirt.org/repos/ci-tools/el6 - extra-packages: | + srcrpm-req-packages: | maven3 arch: - x86_64 diff --git a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml index eb8c92f..0a87e8a 100644 --- a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml @@ -27,7 +27,7 @@ - x86_64 # PPC64 is not available yet # - ppc64 - extra-build-packages: | + srcrpm-req-packages: | autoreconf gettext-devel make @@ -57,7 +57,7 @@ libtool gettext-devel python-ioprocess - extra-packages: | + rpm-req-packages: | pyflakes python-pep8 extra-env: | @@ -97,7 +97,7 @@ ovirt-master-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro ovirt-master-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro epel-testing,http://download.fedoraproject.org/pub/epel/testing/7/\\$basearch - extra-build-packages: | + srcrpm-req-packages: | autoreconf gettext-devel make @@ -127,7 +127,7 @@ libtool gettext-devel python-ioprocess - extra-packages: | + rpm-req-packages: | pyflakes python-pep8 extra-env: | diff --git a/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml b/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml index 248f785..0e37420 100644 --- a/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml +++ b/jobs/confs/yaml/jobs/vdsm/vdsm_install-rpm-sanity.yaml @@ -26,7 +26,6 @@ - '{project}_{version}_install-rpm-sanity-{distro}_{trigger}': trigger-files: 'vdsm.spec.in' # Ugly fix until BZ#1111601 is solved - extra-packages: 'm2crypto' - extra-rpmbuild-options: 'with_check=0' + rpm-req-packages: 'm2crypto' packages: 'exported-artifacts/vdsm-*rpm' env: 'NOSE_EXCLUDE=.*' diff --git a/jobs/confs/yaml/templates/create-rpms_mock.yaml b/jobs/confs/yaml/templates/create-rpms_mock.yaml index 4797839..c22ff2e 100644 --- a/jobs/confs/yaml/templates/create-rpms_mock.yaml +++ b/jobs/confs/yaml/templates/create-rpms_mock.yaml @@ -16,11 +16,12 @@ project: '{project}' distro: '{distro}' arch: '{arch}' - extra-packages: '{extra-packages}' - extra-build-packages: '{extra-build-packages}' - extra-rpmbuild-options: '{extra-rpmbuild-options}' - extra-autogen-options: '{extra-autogen-options}' - extra-configure-options: '{extra-configure-options}' + rpm-req-packages: '{rpm-req-packages}' + srcrpm-req-packages: '{srcrpm-req-packages}' + srcrpm-rpmbuild-options: '{rpmbuild-options}' + rpm-rpmbuild-options: '{rpmbiuld-options}' + autogen-options: '{autogen-options}' + configure-options: '{configure-options}' extra-repos: '{extra-repos}' extra-env: '{extra-env}' publishers: @@ -47,11 +48,11 @@ subproject: '{subproject}' distro: '{distro}' arch: '{arch}' - extra-packages: '{extra-packages}' - extra-build-packages: '{extra-build-packages}' - extra-build-options: '{extra-build-options}' - extra-rpmbuild-options: '{extra-rpmbuild-options}' - extra-build-options: '{extra-build-options}' + buildsh-options: '{buildsh-options}' + srcrpm-req-packages: '{srcrpm-req-packages}' + srcrpm-rpmbuild-options: '{srcrpm-rpmbuild-options}' + rpm-req-packages: '{rpm-req-packages}' + rpm-rpmbuild-options: '{rpm-rpmbuild-options}' extra-repos: '{extra-repos}' extra-env: '{extra-env}' publishers: diff --git a/jobs/confs/yaml/templates/install-rpm-sanity.yaml b/jobs/confs/yaml/templates/install-rpm-sanity.yaml index adfaa6e..684b8b9 100644 --- a/jobs/confs/yaml/templates/install-rpm-sanity.yaml +++ b/jobs/confs/yaml/templates/install-rpm-sanity.yaml @@ -17,10 +17,12 @@ project: '{project}' distro: '{distro}' arch: '{arch}' - extra-packages: '{extra-packages}' - extra-rpmbuild-options: '{extra-rpmbuild-options}' - extra-autogen-options: '{extra-autogen-options}' - extra-configure-options: '{extra-configure-options}' + srcrpm-req-packages: '{srcrpm-req-packages}' + srcrpm-rpmbuild-options: '{srcrpm-rpmbuild-options}' + rpm-req-packages: '{rpm-req-packages}' + rpm-rpmbuild-options: '{rpm-rpmbuild-options}' + autogen-options: '{autogen-options}' + configure-options: '{configure-options}' extra-repos: '{extra-repos}' packages: '{packages}' env: '{env}' -- To view, visit http://gerrit.ovirt.org/33764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0d98f9d773070f0585f156ec757f834ca2391e4 Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: David Caro <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
