Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 24BB510425 for ; Mon, 10 Nov 2014 21:32:01 +0000 (UTC) Received: (qmail 81850 invoked by uid 500); 10 Nov 2014 21:32:01 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 81794 invoked by uid 500); 10 Nov 2014 21:32:00 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 81783 invoked by uid 99); 10 Nov 2014 21:32:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Nov 2014 21:32:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A70D19A4885; Mon, 10 Nov 2014 21:32:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jspeidel@apache.org To: commits@ambari.apache.org Date: Mon, 10 Nov 2014 21:32:00 -0000 Message-Id: <6527fb2ad2c24487b075c90bb6a77750@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/11] ambari git commit: AMBARI-7175. Add explicit stack service inheritance Repository: ambari Updated Branches: refs/heads/trunk b71407f06 -> 2fc7adece http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/package/dummy-script.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/package/dummy-script.py b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/package/dummy-script.py new file mode 100644 index 0000000..35de4bb --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/HDFS/package/dummy-script.py @@ -0,0 +1,20 @@ +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Ambari Agent + +""" http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/SQOOP2/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/SQOOP2/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/SQOOP2/metainfo.xml new file mode 100644 index 0000000..33cf448 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/1.0/services/SQOOP2/metainfo.xml @@ -0,0 +1,30 @@ + + + + 2.0 + + + SQOOP2 + Sqoop + Results in a cycle since v2.0 extends this version + Extended Version + OTHER/2.0/SQOOP + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/metainfo.xml new file mode 100644 index 0000000..716972f --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/metainfo.xml @@ -0,0 +1,24 @@ + + + + + true + + 1.0 + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/hdp.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/hdp.json b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/hdp.json new file mode 100644 index 0000000..fc51627 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/hdp.json @@ -0,0 +1,10 @@ +{ + "HDP-2.1.1": { + "latest": { + "centos6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "redhat6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "oraclelinux6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "suse11": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11/2.x/BUILDS/2.1.1.0-118/hdp.repo" + } + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/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 new file mode 100644 index 0000000..9d8a232 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/repos/repoinfo.xml @@ -0,0 +1,62 @@ + + + + ./hdp.json + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/services/SQOOP2/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/services/SQOOP2/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/services/SQOOP2/metainfo.xml new file mode 100644 index 0000000..d2c0e13 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle/OTHER/2.0/services/SQOOP2/metainfo.xml @@ -0,0 +1,29 @@ + + + + 2.0 + + + SQOOP2 + Sqoop + Inherited from parent + Extended from parent version + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/metainfo.xml new file mode 100644 index 0000000..31716d2 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/metainfo.xml @@ -0,0 +1,23 @@ + + + + + true + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/hdp.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/hdp.json b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/hdp.json new file mode 100644 index 0000000..fc51627 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/hdp.json @@ -0,0 +1,10 @@ +{ + "HDP-2.1.1": { + "latest": { + "centos6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "redhat6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "oraclelinux6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "suse11": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11/2.x/BUILDS/2.1.1.0-118/hdp.repo" + } + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/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 new file mode 100644 index 0000000..9d8a232 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/repos/repoinfo.xml @@ -0,0 +1,62 @@ + + + + ./hdp.json + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/services/HDFS/metainfo.xml new file mode 100644 index 0000000..6060699 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack1/1.0/services/HDFS/metainfo.xml @@ -0,0 +1,28 @@ + + + + 2.0 + + + HDFS + Apache Hadoop Distributed File System + 2.1.0.2.0.6.0 + stack2/1.0/HDFS + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/metainfo.xml new file mode 100644 index 0000000..31716d2 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/metainfo.xml @@ -0,0 +1,23 @@ + + + + + true + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/hdp.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/hdp.json b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/hdp.json new file mode 100644 index 0000000..fc51627 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/hdp.json @@ -0,0 +1,10 @@ +{ + "HDP-2.1.1": { + "latest": { + "centos6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "redhat6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "oraclelinux6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "suse11": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11/2.x/BUILDS/2.1.1.0-118/hdp.repo" + } + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/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 new file mode 100644 index 0000000..9d8a232 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/repos/repoinfo.xml @@ -0,0 +1,62 @@ + + + + ./hdp.json + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/services/HDFS/metainfo.xml new file mode 100644 index 0000000..b036801 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack2/1.0/services/HDFS/metainfo.xml @@ -0,0 +1,28 @@ + + + + 2.0 + + + HDFS + Apache Hadoop Distributed File System + 2.1.0.2.0.6.0 + stack3/1.0/HDFS + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/metainfo.xml new file mode 100644 index 0000000..31716d2 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/metainfo.xml @@ -0,0 +1,23 @@ + + + + + true + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/hdp.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/hdp.json b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/hdp.json new file mode 100644 index 0000000..fc51627 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/hdp.json @@ -0,0 +1,10 @@ +{ + "HDP-2.1.1": { + "latest": { + "centos6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "redhat6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "oraclelinux6": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.1.1.0-118", + "suse11": "http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11/2.x/BUILDS/2.1.1.0-118/hdp.repo" + } + } +} http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/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 new file mode 100644 index 0000000..9d8a232 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/repos/repoinfo.xml @@ -0,0 +1,62 @@ + + + + ./hdp.json + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/centos5/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + + + http://public-repo-1.hortonworks.com/HDP/suse11/2.x/updates/2.0.6.0 + HDP-2.1.1 + HDP + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/2fc7adec/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/services/HDFS/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/services/HDFS/metainfo.xml b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/services/HDFS/metainfo.xml new file mode 100644 index 0000000..8c6fa13 --- /dev/null +++ b/ambari-server/src/test/resources/stacks_with_cycle2/stack3/1.0/services/HDFS/metainfo.xml @@ -0,0 +1,28 @@ + + + + 2.0 + + + HDFS + Apache Hadoop Distributed File System + 2.1.0.2.0.6.0 + stack1/1.0/HDFS + + +