http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/main/resources/stacks/HDPWIN/2.2/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/repos/repoinfo.xml index e429adb..d996dfc 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://dummy_repo</baseurl> <repoid>HDPWIN-2.2</repoid> <reponame>HDPWIN</reponame> + <unique>true</unique> </repo> </os> </reposinfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/main/resources/stacks/HDPWIN/2.3/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/repos/repoinfo.xml index 54a0bf0..5aeb7cf 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.3/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://dummy_repo</baseurl> <repoid>HDPWIN-2.3</repoid> <reponame>HDPWIN</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/main/resources/version_definition.xsd ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/version_definition.xsd b/ambari-server/src/main/resources/version_definition.xsd index bd49028..35deb6e 100644 --- a/ambari-server/src/main/resources/version_definition.xsd +++ b/ambari-server/src/main/resources/version_definition.xsd @@ -122,6 +122,7 @@ <xs:element name="baseurl" type="xs:string" /> <xs:element name="repoid" type="xs:string" /> <xs:element name="reponame" type="xs:string" /> + <xs:element name="unique" type="xs:boolean" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java index 8ba141b..a43a1dc 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java @@ -258,7 +258,7 @@ public class RepositoryVersionResourceProviderTest { final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); final Map<String, Object> properties = new LinkedHashMap<String, Object>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); - properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\"}]}]", Object.class)); + properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\",\"Repositories/unique\":\"true\"}]}]", Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, "1.1"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, "1.1.1.1"); @@ -325,7 +325,7 @@ public class RepositoryVersionResourceProviderTest { entity.setDisplayName("name"); entity.setStack(stackEntity); entity.setVersion("1.1"); - entity.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]"); + entity.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]"); final RepositoryVersionDAO repositoryVersionDAO = injector.getInstance(RepositoryVersionDAO.class); AmbariMetaInfo info = injector.getInstance(AmbariMetaInfo.class); @@ -369,7 +369,7 @@ public class RepositoryVersionResourceProviderTest { entity.setDisplayName("name"); entity.setStack(stackEntity); entity.setVersion("1.1"); - entity.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]"); + entity.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]"); repositoryVersionDAO.create(entity); final RepositoryVersionEntity entity2 = new RepositoryVersionEntity(); @@ -377,7 +377,7 @@ public class RepositoryVersionResourceProviderTest { entity2.setDisplayName("name2"); entity2.setStack(stackEntity); entity2.setVersion("1.2"); - entity2.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]"); + entity2.setOperatingSystems("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]"); try { RepositoryVersionResourceProvider.validateRepositoryVersion(repositoryVersionDAO, info, entity2); @@ -390,7 +390,7 @@ public class RepositoryVersionResourceProviderTest { entity3.setDisplayName("name2"); entity3.setStack(stackEntity); entity3.setVersion("1.1"); - entity3.setOperatingSystems("[{\"OperatingSystems/ambari_managed_repositories\": true, \"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]"); + entity3.setOperatingSystems("[{\"OperatingSystems/ambari_managed_repositories\": true, \"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]"); try { RepositoryVersionResourceProvider.validateRepositoryVersion(repositoryVersionDAO, info, entity3); @@ -399,7 +399,7 @@ public class RepositoryVersionResourceProviderTest { // expected } - entity3.setOperatingSystems("[{\"OperatingSystems/ambari_managed_repositories\": false, \"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]"); + entity3.setOperatingSystems("[{\"OperatingSystems/ambari_managed_repositories\": false, \"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]"); RepositoryVersionResourceProvider.validateRepositoryVersion(repositoryVersionDAO, info, entity3); } @@ -422,7 +422,7 @@ public class RepositoryVersionResourceProviderTest { final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); final Map<String, Object> properties = new LinkedHashMap<String, Object>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); - properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\"}]}]", Object.class)); + properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\",\"Repositories/unique\":\"true\"}]}]", Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, "1.1"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, "1.1.1.2"); @@ -470,7 +470,7 @@ public class RepositoryVersionResourceProviderTest { final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); final Map<String, Object> properties = new LinkedHashMap<String, Object>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); - properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]", Object.class)); + properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]", Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, "1.1"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, "1.1.1.1"); @@ -517,7 +517,7 @@ public class RepositoryVersionResourceProviderTest { } } - properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"2\",\"Repositories/repo_name\":\"2\",\"Repositories/base_url\":\"2\"}]}]", Object.class)); + properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"2\",\"Repositories/repo_name\":\"2\",\"Repositories/base_url\":\"2\",\"Repositories/unique\":\"true\"}]}]", Object.class)); provider.updateResources(updateRequest, new AndPredicate(predicateStackName, predicateStackVersion)); // Now, insert a cluster version whose state is INSTALL_FAILED, so the operation will not be permitted. Mockito.when(clusterVersionDAO.findByStackAndVersion(Mockito.anyString(), Mockito.anyString(), Mockito.anyString())).thenAnswer( @@ -554,7 +554,7 @@ public class RepositoryVersionResourceProviderTest { final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); final Map<String, Object> properties = new LinkedHashMap<String, Object>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); - properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]", Object.class)); + properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]", Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID, "1.1"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID, "1.1.1.1"); @@ -575,7 +575,7 @@ public class RepositoryVersionResourceProviderTest { properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_ID_PROPERTY_ID, "1"); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name2"); - properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/ambari_managed_repositories\":false, \"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\"}]}]", Object.class)); + properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/ambari_managed_repositories\":false, \"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]", Object.class)); final Request updateRequest = PropertyHelper.getUpdateRequest(properties, null); provider.updateResources(updateRequest, new AndPredicate(predicateStackName, predicateStackVersion)); http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java index 8d82d09..437cc42 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelperTest.java @@ -57,9 +57,10 @@ public class RepositoryVersionHelperTest { repository.setBaseUrl("baseurl"); repository.setOsType("os"); repository.setRepoId("repoId"); + repository.setUnique(true); repositories.add(repository); final String serialized = helper.serializeOperatingSystems(repositories); - Assert.assertEquals("[{\"repositories\":[{\"Repositories/base_url\":\"baseurl\",\"Repositories/repo_id\":\"repoId\"}],\"OperatingSystems/os_type\":\"os\"}]", serialized); + Assert.assertEquals("[{\"repositories\":[{\"Repositories/base_url\":\"baseurl\",\"Repositories/repo_id\":\"repoId\",\"Repositories/unique\":true}],\"OperatingSystems/os_type\":\"os\"}]", serialized); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/bad-stacks/HDP/0.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/repos/repoinfo.xml b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/repos/repoinfo.xml index 6948ae7..f21b027 100644 --- a/ambari-server/src/test/resources/bad-stacks/HDP/0.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/bad-stacks/HDP/0.1/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/hbase_version_test.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/hbase_version_test.xml b/ambari-server/src/test/resources/hbase_version_test.xml index ca8018b..58c8701 100644 --- a/ambari-server/src/test/resources/hbase_version_test.xml +++ b/ambari-server/src/test/resources/hbase_version_test.xml @@ -43,11 +43,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.4.0</baseurl> <repoid>HDP-2.3</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> </repository-info> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/0.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/0.1/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.1/repos/repoinfo.xml index 1ea1809..b38d463 100644 --- a/ambari-server/src/test/resources/stacks/HDP/0.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/0.1/repos/repoinfo.xml @@ -21,17 +21,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -40,17 +43,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/0.2/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/repos/repoinfo.xml index c0095b5..9b3b1c7 100644 --- a/ambari-server/src/test/resources/stacks/HDP/0.2/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/0.2/repos/repoinfo.xml @@ -21,17 +21,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -40,17 +43,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/1.2.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.2.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.2.0/repos/repoinfo.xml index 04613ad..a9e1b3c 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.2.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.2.0/repos/repoinfo.xml @@ -21,11 +21,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos6</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -34,11 +36,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos5</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -47,11 +51,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos6</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -60,11 +66,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos5</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -73,11 +81,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos6</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -86,11 +96,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/centos5</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -99,11 +111,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/suse11</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> </os> @@ -112,11 +126,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.2.0/repos/suse11</baseurl> <repoid>HDP-1.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/1.3.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.0/repos/repoinfo.xml index ec0be8f..71d2157 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.0/repos/repoinfo.xml @@ -21,11 +21,13 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos6</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -34,11 +36,13 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos5</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -47,11 +51,13 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos6</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -60,11 +66,13 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos5</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -73,11 +81,13 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos6</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -86,11 +96,13 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/centos5</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -99,6 +111,7 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/suse11</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -106,6 +119,7 @@ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-1.3.0/repos/suse11</baseurl> <repoid>HDP-1.3.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/1.3.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/1.3.1/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/1.3.1/repos/repoinfo.xml index ed1aed8..a1f2a17 100644 --- a/ambari-server/src/test/resources/stacks/HDP/1.3.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/1.3.1/repos/repoinfo.xml @@ -21,11 +21,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.2.1</baseurl> <repoid>HDP-1.2.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -34,11 +36,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.2.1</baseurl> <repoid>HDP-1.2.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -47,11 +51,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/1.x/updates/1.2.1</baseurl> <repoid>HDP-1.2.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -60,11 +66,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/1.x/updates/1.2.1</baseurl> <repoid>HDP-1.2.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl></baseurl> <repoid>HDP-epel</repoid> <reponame>HDP-epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> @@ -73,11 +81,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.2.1</baseurl> <repoid>HDP-1.2.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> </os> @@ -86,11 +96,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.2.1</baseurl> <repoid>HDP-1.2.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.0.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/repos/repoinfo.xml index eb026a7..f123a6c 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-2.0.0.2/repos/centos6</baseurl> <repoid>HDP-2.0.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -28,6 +29,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-2.0.0.2/repos/centos5</baseurl> <repoid>HDP-2.0.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -35,6 +37,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-2.0.0.2/repos/centos6</baseurl> <repoid>HDP-2.0.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -42,6 +45,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-2.0.0.2/repos/centos5</baseurl> <repoid>HDP-2.0.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <!-- @@ -50,11 +54,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-2.0.1/repos/suse11</baseurl> <repoid>HDP-2.0.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> </os> @@ -63,11 +69,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-2.0.1/repos/suse11</baseurl> <repoid>HDP-2.0.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.0.5/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/repos/repoinfo.xml index 91f0f02..25b2880 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0/repos/centos6</baseurl> <repoid>HDP-2.0.5</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -28,6 +29,7 @@ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0/repos/centos5</baseurl> <repoid>HDP-2.0.5</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -35,6 +37,7 @@ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0/repos/centos6</baseurl> <repoid>HDP-2.0.5</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -42,6 +45,7 @@ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0/repos/centos5</baseurl> <repoid>HDP-2.0.5</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -49,6 +53,7 @@ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0/repos/suse11</baseurl> <repoid>HDP-2.0.5</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -56,6 +61,7 @@ <baseurl>http://dev.hortonworks.com.s3.amazonaws.com/HDP-2.0.5.0/repos/suse11</baseurl> <repoid>HDP-2.0.5</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/repos/repoinfo.xml index 2739c5c..924e0e7 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -28,6 +29,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -35,6 +37,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -42,6 +45,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -49,6 +53,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -56,6 +61,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.0.6/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/repos/repoinfo.xml index 2739c5c..924e0e7 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -28,6 +29,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -35,6 +37,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -42,6 +45,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -49,6 +53,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -56,6 +61,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.6</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.0.7/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/repos/repoinfo.xml index 8ebea21..41417d4 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.7</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -28,6 +29,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.7</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -35,6 +37,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.7</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -42,6 +45,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.7</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -49,6 +53,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.7</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -56,6 +61,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.7</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml index e3ebea1..acd3556 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HBASE/metainfo.xml @@ -92,6 +92,7 @@ <baseurl>http://something.com/centos6/2.x/updates/1</baseurl> <repoid>Custom-repo-1</repoid> <reponame>Custom-repo</reponame> + <unique>true</unique> </repo> <packages> <package> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.0.8/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.8/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.8/repos/repoinfo.xml index f8542d0..1669253 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.8/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.8/repos/repoinfo.xml @@ -21,6 +21,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.8</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -28,6 +29,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.8</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -35,6 +37,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.8</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -42,6 +45,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.8</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -49,6 +53,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.8</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -56,6 +61,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.0.8</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.1.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.1.1/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.1.1/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.1.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.1.1/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml index 6c2f99a..1e4f244 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0.ECS/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="any"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo.emc.com/ECS/2.2/updates/2.2.0.0</baseurl> <repoid>ECS-2.2.0.0</repoid> <reponame>ECS</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/repoinfo.xml index 207d258..031f5fd 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-123.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-123.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-123.xml index 0b027ee..34d208d 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-123.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-123.xml @@ -38,11 +38,13 @@ <baseurl>http://baseurl1</baseurl> <repoid>HDP-2.4</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://baseurl2</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> </repository-info> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-124-suse11.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-124-suse11.xml b/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-124-suse11.xml index 68d811a..d4c96b3 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-124-suse11.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.2.0/repos/version-2.2.0.4-124-suse11.xml @@ -38,11 +38,13 @@ <baseurl>http://baseurl3</baseurl> <repoid>HDP-2.4</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://baseurl4</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/OTHER/1.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/OTHER/1.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/OTHER/1.0/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks/OTHER/1.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/OTHER/1.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks/OTHER/2.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/OTHER/2.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks/OTHER/2.0/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks/OTHER/2.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks/OTHER/2.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/repos/repoinfo.xml index 1ea1809..b38d463 100644 --- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/repos/repoinfo.xml @@ -21,17 +21,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -40,17 +43,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/repos/repoinfo.xml index c0095b5..9b3b1c7 100644 --- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/repos/repoinfo.xml @@ -21,17 +21,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -40,17 +43,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/repoinfo.xml index 9d8a232..5345c20 100644 --- a/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="centos5"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat6"> @@ -36,6 +38,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="redhat5"> @@ -43,6 +46,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -50,6 +54,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="sles11"> @@ -57,6 +62,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0</baseurl> <repoid>HDP-2.1.1</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.1/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.1/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.1/repos/repoinfo.xml index 1ea1809..b38d463 100644 --- a/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.1/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.1/repos/repoinfo.xml @@ -21,17 +21,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -40,17 +43,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.2/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.2/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.2/repos/repoinfo.xml index c0095b5..9b3b1c7 100644 --- a/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.2/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_extensions/HDP/0.2/repos/repoinfo.xml @@ -21,17 +21,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos6</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch]]></mirrorslist> </repo> </os> @@ -40,17 +43,20 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP-1.1.1.16/repos/centos5</baseurl> <repoid>HDP-1.1.1.16</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos5</baseurl> <repoid>HDP-UTILS-1.1.0.15</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> <mirrorslist></mirrorslist> </repo> <repo> <baseurl></baseurl> <repoid>epel</repoid> <reponame>epel</reponame> + <unique>true</unique> <mirrorslist><![CDATA[https://mirrors.fedoraproject.org/metalink?repo=epel-5&arch=$basearch]]></mirrorslist> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/repoinfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/repoinfo.xml b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/repoinfo.xml index 207d258..031f5fd 100644 --- a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/repoinfo.xml +++ b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/repoinfo.xml @@ -22,6 +22,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> <os family="suse11"> @@ -29,6 +30,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.2.0.0</baseurl> <repoid>HDP-2.2.0</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> </reposinfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/version-2.2.0.4-123.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/version-2.2.0.4-123.xml b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/version-2.2.0.4-123.xml index 0b027ee..34d208d 100644 --- a/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/version-2.2.0.4-123.xml +++ b/ambari-server/src/test/resources/stacks_with_upgrade_cycle/HDP/2.2.0/repos/version-2.2.0.4-123.xml @@ -38,11 +38,13 @@ <baseurl>http://baseurl1</baseurl> <repoid>HDP-2.4</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://baseurl2</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> </repository-info> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/version_definition_resource_provider.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/version_definition_resource_provider.xml b/ambari-server/src/test/resources/version_definition_resource_provider.xml index 55cd1c1..eda0134 100644 --- a/ambari-server/src/test/resources/version_definition_resource_provider.xml +++ b/ambari-server/src/test/resources/version_definition_resource_provider.xml @@ -47,11 +47,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0</baseurl> <repoid>HDP-2.3</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> <os family="suse11"> @@ -59,6 +61,7 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos7/2.x/updates/2.3.0.0</baseurl> <repoid>HDP-2.3</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/version_definition_test.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/version_definition_test.xml b/ambari-server/src/test/resources/version_definition_test.xml index 1520774..069ac4a 100644 --- a/ambari-server/src/test/resources/version_definition_test.xml +++ b/ambari-server/src/test/resources/version_definition_test.xml @@ -49,11 +49,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0</baseurl> <repoid>HDP-2.3</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> <os family="redhat7"> @@ -61,11 +63,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos7/2.x/updates/2.3.0.0</baseurl> <repoid>HDP-2.3</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos7</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> http://git-wip-us.apache.org/repos/asf/ambari/blob/02256c3f/ambari-server/src/test/resources/version_definition_test_all_services.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/version_definition_test_all_services.xml b/ambari-server/src/test/resources/version_definition_test_all_services.xml index 7557f7a..ecbd378 100644 --- a/ambari-server/src/test/resources/version_definition_test_all_services.xml +++ b/ambari-server/src/test/resources/version_definition_test_all_services.xml @@ -43,11 +43,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0</baseurl> <repoid>HDP-2.3</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os> <os family="redhat7"> @@ -55,11 +57,13 @@ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos7/2.x/updates/2.3.0.0</baseurl> <repoid>HDP-2.3</repoid> <reponame>HDP</reponame> + <unique>true</unique> </repo> <repo> <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos7</baseurl> <repoid>HDP-UTILS-1.1.0.20</repoid> <reponame>HDP-UTILS</reponame> + <unique>false</unique> </repo> </os>