David Caro has uploaded a new change for review. Change subject: Allowing common vars on the extra repos urls ......................................................................
Allowing common vars on the extra repos urls It's not liuke letting yum handle it natively, but I've been unable to work around mock to get that done so far. Change-Id: I43239e18c883d538abfcf806531564adc5e61d89 Signed-off-by: David Caro <[email protected]> --- 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/shell-scripts/mock_install.sh M jobs/confs/shell-scripts/mock_run.sh M jobs/confs/shell-scripts/standard_build_artifacts.sh M jobs/confs/shell-scripts/standard_check_merged.sh M jobs/confs/shell-scripts/standard_check_patch.sh M jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml 9 files changed, 42 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/85/38185/1 diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm.sh b/jobs/confs/shell-scripts/build_mock_srcrpm.sh index 0bbfc2e..1689a34 100644 --- a/jobs/confs/shell-scripts/build_mock_srcrpm.sh +++ b/jobs/confs/shell-scripts/build_mock_srcrpm.sh @@ -52,10 +52,13 @@ make {extra-build-packages} ) -extra_repos=({extra-repos}) extra_env=({extra-env}) to_cherry_pick=({cherry-pick}) WORKSPACE=$PWD +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_repos=({extra-repos}) # Get the release suffix pushd "$WORKSPACE/$project" diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh b/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh index f481b57..c8ff47d 100644 --- a/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh +++ b/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh @@ -41,9 +41,12 @@ extra_build_packages=({extra-build-packages}) extra_build_options=({extra-build-options}) extra_rpmbuild_options=({extra-rpmbuild-options}) -extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_repos=({extra-repos}) ### Generate the mock configuration diff --git a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh index 651463c..569a3ed 100644 --- a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh +++ b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh @@ -33,9 +33,12 @@ project="{project}" extra_packages=({extra-packages}) extra_rpmbuild_options=({extra-rpmbuild-options}) -extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_repos=({extra-repos}) ### Import the suffix if any [[ -f "${{WORKSPACE}}/tmp/rpm_suffix.inc" ]] \ diff --git a/jobs/confs/shell-scripts/mock_install.sh b/jobs/confs/shell-scripts/mock_install.sh index b8d9fe7..3046d59 100644 --- a/jobs/confs/shell-scripts/mock_install.sh +++ b/jobs/confs/shell-scripts/mock_install.sh @@ -29,8 +29,11 @@ arch="{arch}" project="{project}" packages=({packages}) -extra_repos=({extra-repos}) extra_env="{env}" +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_repos=({extra-repos}) ### Generate the mock configuration diff --git a/jobs/confs/shell-scripts/mock_run.sh b/jobs/confs/shell-scripts/mock_run.sh index cfa466a..770cf48 100644 --- a/jobs/confs/shell-scripts/mock_run.sh +++ b/jobs/confs/shell-scripts/mock_run.sh @@ -34,10 +34,13 @@ arch="{arch}" copy_dirs=({copy-dirs}) project="{project}" -extra_packages=({extra-packages}) extra_repos=({extra-repos}) extra_env="{env}" script="{script}" +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_packages=({extra-packages}) # Generate the mock configuration diff --git a/jobs/confs/shell-scripts/standard_build_artifacts.sh b/jobs/confs/shell-scripts/standard_build_artifacts.sh index 322d989..aa6658d 100644 --- a/jobs/confs/shell-scripts/standard_build_artifacts.sh +++ b/jobs/confs/shell-scripts/standard_build_artifacts.sh @@ -28,10 +28,13 @@ arch="{arch}" project="{project}" extra_packages=({extra-packages}) -extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD script="automation/build-artifacts.sh" +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_repos=({extra-repos}) ### Generate the mock configuration diff --git a/jobs/confs/shell-scripts/standard_check_merged.sh b/jobs/confs/shell-scripts/standard_check_merged.sh index 9b40315..3280e8f 100644 --- a/jobs/confs/shell-scripts/standard_check_merged.sh +++ b/jobs/confs/shell-scripts/standard_check_merged.sh @@ -28,10 +28,13 @@ arch="{arch}" project="{project}" extra_packages=({extra-packages}) -extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD script="automation/check-merged.sh" +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_repos=({extra-repos}) ### Generate the mock configuration diff --git a/jobs/confs/shell-scripts/standard_check_patch.sh b/jobs/confs/shell-scripts/standard_check_patch.sh index cdcba1c..22268f2 100644 --- a/jobs/confs/shell-scripts/standard_check_patch.sh +++ b/jobs/confs/shell-scripts/standard_check_patch.sh @@ -28,10 +28,13 @@ arch="{arch}" project="{project}" extra_packages=({extra-packages}) -extra_repos=({extra-repos}) extra_env=({extra-env}) WORKSPACE=$PWD script="automation/check-patch.sh" +## For the extra repos url vars +basearch="$arch" +releasever="${{distro##*[^[:digit:]]}}" +extra_repos=({extra-repos}) ### Generate the mock configuration diff --git a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml index c21b2dc..6e16abc 100644 --- a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml @@ -19,13 +19,13 @@ ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro ci-tools,http://resources.ovirt.org/repos/ci-tools/$distro - gluster-epel6,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-6/\\$basearch + gluster-epel6,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-6/$basearch - el7: extra-repos: | ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-3.5-snapshot/rpm/$distro ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro ci-tools,http://resources.ovirt.org/repos/ci-tools/$distro - gluster-epel7,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/\\$basearch + gluster-epel7,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/$basearch arch: - x86_64 # PPC64 is not available yet @@ -90,26 +90,26 @@ extra-repos: | 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 - updates-testing,http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/\\$basearch - gluster-fc20,http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-20/\\$basearch + updates-testing,http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch + gluster-fc20,http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-20/$basearch - fc21: extra-repos: | 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 - updates-testing,http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/\\$basearch - gluster-fc21,http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-21/\\$basearch + updates-testing,http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch + gluster-fc21,http://download.gluster.org/pub/gluster/glusterfs/LATEST/Fedora/fedora-21/$basearch - el6: extra-repos: | 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/6/\\$basearch - gluster-epel6,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-6/\\$basearch + epel-testing,http://download.fedoraproject.org/pub/epel/testing/6/$basearch + gluster-epel6,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-6/$basearch - el7: extra-repos: | 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 - gluster-epel7,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/\\$basearch + epel-testing,http://download.fedoraproject.org/pub/epel/testing/7/$basearch + gluster-epel7,http://download.gluster.org/pub/gluster/glusterfs/LATEST/EPEL.repo/epel-7/$basearch extra-build-packages: | autoreconf gettext-devel -- To view, visit https://gerrit.ovirt.org/38185 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43239e18c883d538abfcf806531564adc5e61d89 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
