From e7ae288abda11d3198cc9d57a598b53a894a8e4c Mon Sep 17 00:00:00 2001 From: Garret Raziel Date: Wed, 4 Mar 2015 12:26:02 +0100 Subject: [PATCH] remove hardcoded repo urls --- templates | 4 ++-- tests/_boot_to_anaconda.pm | 2 +- tests/install_source_graphical.pm | 2 +- tests/install_source_variation.pm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates b/templates index 32cc9523..6af7e159 100755 --- a/templates +++ b/templates @@ -183,7 +183,7 @@ name => "server_repository_http_graphical", prio => 7, settings => [ - { key => "REPOSITORY_GRAPHICAL", value => "1" }, + { key => "REPOSITORY_GRAPHICAL", value => "http://dl.fedoraproject.org/pub/fedora/linux/development" }, ], variables => "", }, @@ -191,7 +191,7 @@ name => "server_repository_http_variation", prio => 8, settings => [ - { key => "REPOSITORY_VARIATION", value => "1" }, + { key => "REPOSITORY_VARIATION", value => "http://dl.fedoraproject.org/pub/fedora/linux/development" }, ], variables => "", }, diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index 9cc8db12..f46da61f 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -28,7 +28,7 @@ sub run { $fedora_version = lc((split /_/, get_var("BUILD"))[0]); - $repourl = "http://download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os"; + $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; type_string " inst.repo=".$repourl; } diff --git a/tests/install_source_graphical.pm b/tests/install_source_graphical.pm index 6bb29573..a06e3b34 100644 --- a/tests/install_source_graphical.pm +++ b/tests/install_source_graphical.pm @@ -38,7 +38,7 @@ sub run { assert_and_click "anaconda_install_source_repo_select_mirrorlist"; } elsif (get_var("REPOSITORY_GRAPHICAL")){ - $repourl = "download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os"; + $repourl = get_var("REPOSITORY_GRAPHICAL")."/".$fedora_version."/".get_var("ARCH")."/os"; type_string $repourl; } diff --git a/tests/install_source_variation.pm b/tests/install_source_variation.pm index eabcd42e..d833bdc3 100644 --- a/tests/install_source_variation.pm +++ b/tests/install_source_variation.pm @@ -12,7 +12,7 @@ sub run { my $fedora_version = lc((split /_/, get_var("BUILD"))[0]); my $repourl = ""; - $repourl = "download.fedoraproject.org/pub/fedora/linux/development/".$fedora_version."/".get_var("ARCH")."/os"; + $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; # check that the repo was used send_key "ctrl-alt-f2";