[BGBUILD-306] Switch for updates-testing repository for integration t…

…ests
bmahe · Sep 8, 2011 · d06761f · d06761f
1 parent 8719b14
commit d06761f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 v0.10.0
 
 * [BGBUILD-307] Appliance with swap file fails to build if selected OS is centos
+* [BGBUILD-306] Switch for updates-testing repository for integration tests
 
 v0.9.6
 

diff --git a/Manifest b/Manifest
@@ -23,7 +23,6 @@ integ/appliances/modular/_packages_utils.appl
 integ/appliances/modular/_repos_boxgrinder_permanent_noarch.appl
 integ/appliances/modular/_repos_testlocal_ephemeral_noarch.appl
 integ/appliances/modular/_test_base.appl
-integ/appliances/modular/jeos-f15.appl
 integ/appliances/modular/modular.appl
 integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm
 integ/packages/local-repo-test.spec

diff --git a/integ/appliances/jeos-f15.appl b/integ/appliances/jeos-f15.appl
@@ -2,4 +2,8 @@ name: jeos-f15
 os:
   name: fedora
   version: 15
+repos:
+  - name: "temp-fedora-updates-testing"
+    mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#BASE_ARCH#"
+    ephemeral: true
 
diff --git a/integ/appliances/jeos-f16-files.appl b/integ/appliances/jeos-f16-files.appl
@@ -1,7 +1,6 @@
 name: jeos-f16-files
-os:
-  name: fedora
-  version: 16
+appliances:
+  - jeos-f16
 files:
   "/opt":
     - jeos-centos5.appl

diff --git a/integ/appliances/jeos-f16.appl b/integ/appliances/jeos-f16.appl
@@ -2,4 +2,8 @@ name: jeos-f16
 os:
   name: fedora
   version: 16
+repos:
+  - name: "temp-fedora-updates-testing"
+    mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#BASE_ARCH#"
+    ephemeral: true
 
diff --git a/integ/appliances/modular/jeos-f15.appl b/integ/appliances/modular/jeos-f15.appl
diff --git a/integ/appliances/modular/modular.appl b/integ/appliances/modular/modular.appl
@@ -4,7 +4,6 @@ version: 1
 release: 2
 appliances:
   - _test_base
-  - jeos-f15
 post:
   base:
     - "/bin/echo 'true' > /fedora-boxgrinder-test"
@@ -14,3 +13,10 @@ post:
     - "/bin/echo 'true' > /fedora-vmware-boxgrinder-test"
   virtualbox:
     - "/bin/echo 'true' > /fedora-virtualbox-boxgrinder-test"
+os:
+  name: fedora
+  version: 15
+repos:
+  - name: "temp-fedora-updates-testing"
+    mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#BASE_ARCH#"
+    ephemeral: true
diff --git a/rubygem-boxgrinder-build.spec b/rubygem-boxgrinder-build.spec
@@ -133,6 +133,7 @@ popd
 * Tue Sep 06 2011 Marek Goldmann <[email protected]> - 0.10.0-1
 - Upstream release: 0.10.0
 - [BGBUILD-307] Appliance with swap file fails to build if selected OS is centos
+- [BGBUILD-306] Switch for updates-testing repository for integration tests
 
 * Sat Aug 27 2011 Marek Goldmann <[email protected]> - 0.9.6-1
 - Upstream release: 0.9.6