Sandro Bonazzola has uploaded a new change for review. Change subject: Drop Fedora 19 support ......................................................................
Drop Fedora 19 support Fedora 19 has reached EOL, dropping. See: https://lists.fedoraproject.org/pipermail/announce/2015-January/003248.html Change-Id: I8428a17d3d60417a1e9d7e88d295d75811c385b5 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- 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/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml M jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_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/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml M jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.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 D mock_configs/fedora-19-i386.cfg D mock_configs/fedora-19-x86_64.cfg 21 files changed, 14 insertions(+), 183 deletions(-) git pull ssh://gerrit.ovirt.org:29418/jenkins refs/changes/68/36668/1 diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm.sh b/jobs/confs/shell-scripts/build_mock_srcrpm.sh index 66eb1cf..84c9bc4 100644 --- a/jobs/confs/shell-scripts/build_mock_srcrpm.sh +++ b/jobs/confs/shell-scripts/build_mock_srcrpm.sh @@ -7,8 +7,8 @@ # has been cloned # # distro -# Distribution it should create the rpms for (usually el6, el7, fc19 or -# fc20) +# Distribution it should create the rpms for (usually el6, el7, fc20 or +# fc21) # # arch # Architecture to build the packages for diff --git a/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh b/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh index 8f68b71..581da6d 100644 --- a/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh +++ b/jobs/confs/shell-scripts/build_mock_srcrpm_releng.sh @@ -10,8 +10,8 @@ # has been cloned # # distro -# Distribution it should create the rpms for (usually el6, el7, fc19 or -# fc20) +# Distribution it should create the rpms for (usually el6, el7, fc20 or +# fc21) # # arch # Architecture to build the packages for diff --git a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh index 2183f12..c3435b3 100644 --- a/jobs/confs/shell-scripts/mock_build_onlyrpm.sh +++ b/jobs/confs/shell-scripts/mock_build_onlyrpm.sh @@ -7,8 +7,8 @@ # has been cloned # # distro -# Distribution it should create the rpms for (usually el6, el7, fc19 or -# fc20) +# Distribution it should create the rpms for (usually el6, el7, fc20 or +# fc21) # # arch # Architecture to build the packages for diff --git a/jobs/confs/shell-scripts/mock_install.sh b/jobs/confs/shell-scripts/mock_install.sh index fb01185..da99e04 100644 --- a/jobs/confs/shell-scripts/mock_install.sh +++ b/jobs/confs/shell-scripts/mock_install.sh @@ -8,8 +8,8 @@ # has been cloned # # distro -# Distribution it should create the rpms for (usually el6, el7, fc19 or -# fc20) +# Distribution it should create the rpms for (usually el6, el7, fc20 or +# fc21) # # arch # Architecture to build the packages for diff --git a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml index 887494a..f7fbe74 100644 --- a/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ioprocess/ioprocess_create-rpms.yaml @@ -10,8 +10,6 @@ mock-build-type: - all distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - fc21 - el6 diff --git a/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml b/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml index c3c783f..3b44783 100644 --- a/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/mom/mom_create-rpms.yaml @@ -10,7 +10,6 @@ mock-build-type: - all distro: - - fc19 - fc20 - fc21 - el6 diff --git a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml index 6dba4aa..c86e89f 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-ldap/ovirt-engine-extension-aaa-ldap_create-rpms.yaml @@ -15,13 +15,6 @@ distro: - el6 - el7 - # engine is not build for f19 anymore on master branch, if we - # want to keep building it we have to use 3.5 - - fc19: - 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 - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - fc21 arch: diff --git a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml index 958738e..f2af1db 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-extension-aaa-misc/ovirt-engine-extension-aaa-misc_create-rpms.yaml @@ -15,11 +15,6 @@ distro: - el6 - el7 - - fc19: - 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 - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - fc21 arch: diff --git a/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml index 1342862..35f43a3 100644 --- a/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-engine-extension-logger-log4j/ovirt-engine-extension-logger-log4j_create-rpms.yaml @@ -15,11 +15,6 @@ distro: - el6 - el7 - - fc19: - 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 - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - fc21 arch: diff --git a/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml index e665243..ab55152 100644 --- a/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-host-deploy/ovirt-host-deploy_create-rpms.yaml @@ -20,7 +20,6 @@ distro: - el6 - el7 - - fc19 - fc20 - fc21 arch: 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 d13ce38..883de81 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 @@ -34,8 +34,6 @@ trigger: - merged distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - el6 - el7 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 8fee436..3d3b2a4 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 @@ -40,8 +40,6 @@ ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-3.5-snapshot-static/rpm/$distro mock-build-type: onlyrpm distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - el6: extra-build-packages: | diff --git a/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml index de1683a..49613da 100644 --- a/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-image-uploader/ovirt-image-uploader_create-rpms.yaml @@ -1,3 +1,6 @@ +## jjb does not allow discarding variable combination when exploding +## the template, so if we don't want fc21 for branch 3.5, we have to +## create a separated template for it - project: name: ovirt-image-uploader_create-rpms project: @@ -13,8 +16,6 @@ mock-build-type: - onlyrpm distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - el6 - el7 @@ -23,9 +24,6 @@ jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' -## jjb does not allow discarding variable combination when exploding -## the template, so if we don't want fc19 for branch master, we have to -## create a separated template for it - project: name: ovirt-image-uploader_master_create-rpms project: diff --git a/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml index bbadb29..9def305 100644 --- a/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-iso-uploader/ovirt-iso-uploader_create-rpms.yaml @@ -13,8 +13,6 @@ mock-build-type: - onlyrpm distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - el6 - el7 diff --git a/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml index 9732356..0c95e56 100644 --- a/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-log-collector/ovirt-log-collector_create-rpms.yaml @@ -1,3 +1,6 @@ +## jjb does not allow discarding variable combination when exploding +## the template, so if we don't want fc21 for branch 3.5, we have to +## create a separated template for it - project: name: ovirt-log-collector_create-rpms project: @@ -13,8 +16,6 @@ mock-build-type: - onlyrpm distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - el6 - el7 @@ -23,9 +24,6 @@ jobs: - '{project}_{version}_create-rpms-{distro}-{arch}_{trigger}' -## jjb does not allow discarding variable combination when exploding -## the template, so if we don't want fc19 for branch master, we have to -## create a separated template for it - project: name: ovirt-log-collector_master_create-rpms project: diff --git a/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml b/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml index 65c3f57..cb762d9 100644 --- a/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/ovirt-reports/ovirt-reports_create-rpms.yaml @@ -33,8 +33,6 @@ - merged - created distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - el6 - el7 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 24fb73e..b14bb5c 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 @@ -13,8 +13,6 @@ mock-build-type: - all distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - fc21 - el6 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 3803700..d1b432c 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 @@ -10,8 +10,6 @@ mock-build-type: - onlyrpm distro: - - fc19: - node-filter: 'fc19 || fc20 || el6 || el7' - fc20 - el6: extra-repos: | diff --git a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml index 09d346a..a343ef9 100644 --- a/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml +++ b/jobs/confs/yaml/jobs/vdsm/vdsm_create-rpms.yaml @@ -9,12 +9,6 @@ branch: ovirt-3.5 mock-build-type: all distro: - - fc19: - extra-repos: | - ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro - ovirt-3.5-snapshot-static,http://resources.ovirt.org/pub/ovirt-master-snapshot-static/rpm/$distro - ci-tools,http://resources.ovirt.org/repos/ci-tools/$distro - node-filter: 'fc19 || fc20 || el6 || el7' - fc20: extra-repos: | ovirt-3.5-snapshot,http://resources.ovirt.org/pub/ovirt-master-snapshot/rpm/$distro diff --git a/mock_configs/fedora-19-i386.cfg b/mock_configs/fedora-19-i386.cfg deleted file mode 100644 index 9423a64..0000000 --- a/mock_configs/fedora-19-i386.cfg +++ /dev/null @@ -1,63 +0,0 @@ -config_opts['root'] = 'fedora-19-i386' -config_opts['target_arch'] = 'i686' -config_opts['legal_host_arches'] = ('x86_64','i386') -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc19' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '19' - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-19&arch=i386 -failovermethod=priority - -[updates] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=i386 -failovermethod=priority - -[updates-testing] -name=updates-testing -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f19&arch=i386 -failovermethod=priority -enabled=0 - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/f19-build/latest/i386/ -cost=2000 -enabled=0 - -[fedora-debuginfo] -name=fedora-debuginfo -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-19&arch=i386 -failovermethod=priority -enabled=0 - -[updates-debuginfo] -name=updates-debuginfo -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f19&arch=i386 -failovermethod=priority -enabled=0 - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f19&arch=i386 -failovermethod=priority -enabled=0 -""" diff --git a/mock_configs/fedora-19-x86_64.cfg b/mock_configs/fedora-19-x86_64.cfg deleted file mode 100644 index b5bf273..0000000 --- a/mock_configs/fedora-19-x86_64.cfg +++ /dev/null @@ -1,63 +0,0 @@ -config_opts['root'] = 'fedora-19-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc19' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '19' - -config_opts['yum.conf'] = """ -[main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-19&arch=x86_64 -failovermethod=priority - -[updates] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=x86_64 -failovermethod=priority - -[updates-testing] -name=updates-testing -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f19&arch=x86_64 -failovermethod=priority -enabled=0 - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/f19-build/latest/x86_64/ -cost=2000 -enabled=0 - -[fedora-debuginfo] -name=fedora-debuginfo -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-19&arch=x86_64 -failovermethod=priority -enabled=0 - -[updates-debuginfo] -name=updates-debuginfo -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f19&arch=x86_64 -failovermethod=priority -enabled=0 - -[updates-testing-debuginfo] -name=updates-testing-debuginfo -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f19&arch=x86_64 -failovermethod=priority -enabled=0 -""" -- To view, visit http://gerrit.ovirt.org/36668 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8428a17d3d60417a1e9d7e88d295d75811c385b5 Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
