[Libosinfo] [PATCH 2/4] os: Fix invalid URLs
Fabiano Fidêncio
fidencio at redhat.com
Fri Jun 3 10:51:54 UTC 2016
On Fri, Jun 3, 2016 at 11:23 AM, Christophe Fergeau <cfergeau at redhat.com> wrote:
> Some URLs have become obsolete since the last time
> test-treeuris/test-mediauris were run, this fixes these 2 tests.
> ---
> data/os/centos.org/centos-6.7.xml.in | 4 ++--
> data/os/debian.org/debian-8.xml.in | 4 ++--
> data/os/fedoraproject.org/fedora-20.xml.in | 2 +-
> data/os/fedoraproject.org/fedora-21.xml.in | 24 ++++++++++++------------
> data/os/ubuntu.com/ubuntu-15.04.xml.in | 8 ++++----
> 5 files changed, 21 insertions(+), 21 deletions(-)
>
> diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in
> index 3dfd207..e38a2bb 100644
> --- a/data/os/centos.org/centos-6.7.xml.in
> +++ b/data/os/centos.org/centos-6.7.xml.in
> @@ -116,7 +116,7 @@
> </media>
>
> <tree arch="i686">
> - <url>http://mirror.centos.org/centos-6/6.7/os/i386</url>
> + <url>http://vault.centos.org/6.7/os/i386</url>
> <treeinfo>
> <family>CentOS</family>
> <version>6.7</version>
> @@ -124,7 +124,7 @@
> </treeinfo>
> </tree>
> <tree arch="x86_64">
> - <url>http://mirror.centos.org/centos-6/6.7/os/x86_64</url>
> + <url>http://vault.centos.org/6.7/os/x86_64</url>
> <treeinfo>
> <family>CentOS</family>
> <version>6.7</version>
> diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
> index e143dd3..bc63369 100644
> --- a/data/os/debian.org/debian-8.xml.in
> +++ b/data/os/debian.org/debian-8.xml.in
> @@ -29,7 +29,7 @@
> </resources>
>
> <media arch="i686">
> - <url>http://cdimage.debian.org/debian-cd/8.3.0/i386/iso-dvd/debian-8.3.0-i386-DVD-1.iso</url>
> + <url>http://cdimage.debian.org/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso</url>
> <iso>
> <volume-id>Debian 8.\d.\d i386 1</volume-id>
> </iso>
> @@ -37,7 +37,7 @@
> <initrd>install.386/initrd.gz</initrd>
> </media>
> <media arch="x86_64">
> - <url>http://cdimage.debian.org/debian-cd/8.3.0/amd64/iso-dvd/debian-8.3.0-amd64-DVD-1.iso</url>
> + <url>http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso</url>
> <iso>
> <volume-id>Debian 8.\d.\d amd64 1</volume-id>
> </iso>
> diff --git a/data/os/fedoraproject.org/fedora-20.xml.in b/data/os/fedoraproject.org/fedora-20.xml.in
> index 4e931f4..9917e5d 100644
> --- a/data/os/fedoraproject.org/fedora-20.xml.in
> +++ b/data/os/fedoraproject.org/fedora-20.xml.in
> @@ -54,7 +54,7 @@
> <initrd>isolinux/initrd.img</initrd>
> </media>
> <media arch="ppc64">
> - <url>http://download.fedoraproject.org/pub/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso</url>
> + <url>http://archive.fedoraproject.org/pub/archive/fedora-secondary/releases/20/Fedora/ppc64/iso/Fedora-20-ppc64-DVD.iso</url>
>
> <iso>
> <volume-id>Fedora_20_ppc64</volume-id>
> diff --git a/data/os/fedoraproject.org/fedora-21.xml.in b/data/os/fedoraproject.org/fedora-21.xml.in
> index 9a83f3f..19fb9bb 100644
> --- a/data/os/fedoraproject.org/fedora-21.xml.in
> +++ b/data/os/fedoraproject.org/fedora-21.xml.in
> @@ -37,7 +37,7 @@
>
> <media arch="i686" live="true">
> <variant id="workstation"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Workstation/i386/iso/Fedora-Live-Workstation-i686-21-5.iso</url>
> <iso>
> <volume-id>Fedora-Live-WS-i686-21.*</volume-id>
> <system-id>LINUX</system-id>
> @@ -48,7 +48,7 @@
> </media>
> <media arch="x86_64" live="true">
> <variant id="workstation"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-21-5.iso</url>
> <iso>
> <volume-id>Fedora-Live-WS-x86_64-21.*</volume-id>
> <system-id>LINUX</system-id>
> @@ -63,7 +63,7 @@
> <!-- DVD -->
> <media arch="i686">
> <variant id="server"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-DVD-i386-21.iso</url>
> <iso>
> <volume-id>Fedora-S.*21.*-i386</volume-id>
> <system-id>LINUX</system-id>
> @@ -74,7 +74,7 @@
> </media>
> <media arch="x86_64">
> <variant id="server"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-DVD-x86_64-21.iso</url>
> <iso>
> <volume-id>Fedora-S.*-21.*-x86_64</volume-id>
> <system-id>LINUX</system-id>
> @@ -92,7 +92,7 @@
> !-->
> <media arch="i686">
> <variant id="netinst"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/iso/Fedora-Server-netinst-i386-21.iso</url>
> <iso>
> <volume-id>Fedora-S.*21.*-i386</volume-id>
> <system-id>LINUX</system-id>
> @@ -103,7 +103,7 @@
> </media>
> <media arch="x86_64">
> <variant id="netinst"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/iso/Fedora-Server-netinst-x86_64-21.iso</url>
> <iso>
> <volume-id>Fedora-S.*-21.*-x86_64</volume-id>
> <system-id>LINUX</system-id>
> @@ -115,7 +115,7 @@
>
> <tree arch="i686">
> <variant id="server"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/i386/os/</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/i386/os/</url>
> <treeinfo>
> <family>Fedora</family>
> <version>21</version>
> @@ -123,7 +123,7 @@
> </treeinfo>
> </tree>
> <tree arch="x86_64">
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Server/x86_64/os/</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Server/x86_64/os/</url>
> <variant id="server"/>
> <treeinfo>
> <family>Fedora</family>
> @@ -136,7 +136,7 @@
>
> <media arch="i686">
> <variant id="cloud"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/i386/iso/Fedora-Cloud-netinst-i386-21.iso</url>
> <iso>
> <volume-id>Fedora-C.*21.*-i386</volume-id>
> <system-id>LINUX</system-id>
> @@ -147,7 +147,7 @@
> </media>
> <media arch="x86_64">
> <variant id="cloud"/>
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/x86_64/iso/Fedora-Cloud-netinst-x86_64-21.iso</url>
> <iso>
> <volume-id>Fedora-C.*-21.*-x86_64</volume-id>
> <system-id>LINUX</system-id>
> @@ -158,7 +158,7 @@
> </media>
>
> <tree arch="i686">
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/i386/os/</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/i386/os/</url>
> <variant id="cloud"/>
> <treeinfo>
> <family>Fedora</family>
> @@ -167,7 +167,7 @@
> </treeinfo>
> </tree>
> <tree arch="x86_64">
> - <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Cloud/x86_64/os/</url>
> + <url>https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Cloud/x86_64/os/</url>
> <variant id="cloud"/>
> <treeinfo>
> <family>Fedora</family>
> diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> index f318052..34111d7 100644
> --- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
> +++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
> @@ -29,7 +29,7 @@
> </resources>
>
> <media arch="i686">
> - <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso</url>
> + <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso</url>
> <iso>
> <volume-id>Ubuntu-Server 15.04(.\d)? i386</volume-id>
> </iso>
> @@ -37,7 +37,7 @@
> <initrd>install/initrd.gz</initrd>
> </media>
> <media arch="x86_64">
> - <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url>
> + <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url>
> <iso>
> <volume-id>Ubuntu-Server 15.04(.\d)? amd64</volume-id>
> </iso>
> @@ -45,7 +45,7 @@
> <initrd>install/initrd.gz</initrd>
> </media>
> <media arch="i686" live="true">
> - <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url>
> + <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url>
> <iso>
> <volume-id>Ubuntu 15.04(.\d)? i386</volume-id>
> </iso>
> @@ -53,7 +53,7 @@
> <initrd>casper/initrd.lz</initrd>
> </media>
> <media arch="x86_64" live="true">
> - <url>http://releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso</url>
> + <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso</url>
> <iso>
> <volume-id>Ubuntu 15.04(.\d)? amd64</volume-id>
> </iso>
> --
> 2.7.4
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
Acked-by: Fabiano Fidêncio <fidencio at redhat.com>
More information about the Libosinfo
mailing list