You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/10/02 03:23:10 UTC
[1/2] git commit: Revert "AMBARI-3346. Fix repo url parametrization
under Ubuntu (dlysnichenko)"
Updated Branches:
refs/heads/branch-1.4.1 a6da0a027 -> 19d572cf1
Revert "AMBARI-3346. Fix repo url parametrization under Ubuntu (dlysnichenko)"
This reverts commit f53d5a3de6c40a9e57b686cea8ca23b9f76f60d5.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/bd9cdf8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/bd9cdf8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/bd9cdf8e
Branch: refs/heads/branch-1.4.1
Commit: bd9cdf8e7eea847ef3d267f7db403d905e17142d
Parents: a6da0a0
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Oct 1 18:21:45 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Oct 1 18:21:45 2013 -0700
----------------------------------------------------------------------
ambari-server/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bd9cdf8e/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index d802ae1..029cd37 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -496,7 +496,7 @@
</goals>
<configuration>
<target name="ambari-server-compile">
- <exec dir="${basedir}" executable="bash" failonerror="true">
+ <exec dir="${basedir}" executable="sh" failonerror="true">
<arg value="${basedir}/set-hdp-repo-url.sh"/>
<arg value="${hdpUrlForCentos6}"/>
</exec>
@@ -511,7 +511,7 @@
</goals>
<configuration>
<target name="ambari-server-compile">
- <exec dir="${basedir}" executable="bash" failonerror="true">
+ <exec dir="${basedir}" executable="sh" failonerror="true">
<arg value="${basedir}/set-hdp-repo-url.sh"/>
<arg value="${hdpUrlForCentos6}"/>
<arg value="${project.build.directory}/ambari-server-${project.version}-dist/ambari-server-${project.version}"/>
[2/2] git commit: Revert "AMBARI-3302. Parameterize the repo url for
latest stack."
Posted by sm...@apache.org.
Revert "AMBARI-3302. Parameterize the repo url for latest stack."
This reverts commit 761ffed40c7fe05b1d7c7cd239706bc79d12394b.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/19d572cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/19d572cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/19d572cf
Branch: refs/heads/branch-1.4.1
Commit: 19d572cf1e6f5b61fb1e00cc59877aaab84bdc9f
Parents: bd9cdf8
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Oct 1 18:21:55 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Oct 1 18:21:55 2013 -0700
----------------------------------------------------------------------
ambari-server/pom.xml | 63 +++++++-------------
ambari-server/set-hdp-repo-url.sh | 57 ------------------
.../stacks/HDP/2.0.6/repos/repoinfo.xml | 16 ++---
.../stacks/HDPLocal/2.0.6/repos/repoinfo.xml | 16 ++---
4 files changed, 37 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/19d572cf/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 029cd37..00550c3 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -29,7 +29,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<python.ver>python >= 2.6</python.ver>
- <hdpUrlForCentos6>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos6</hdpUrlForCentos6>
</properties>
<build>
<plugins>
@@ -133,6 +132,24 @@
</excludes>
</configuration>
</plugin>
+ <!--<plugin>-->
+ <!-- Will be used for DDL file update on server version update-->
+ <!--<artifactId>maven-antrun-plugin</artifactId>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>Copy-server-version-file</id>-->
+ <!--<phase>process-test-resources</phase>-->
+ <!--<configuration>-->
+ <!--<tasks>-->
+ <!--<copy file="../version" todir="${project.build.directory}/"/>-->
+ <!--</tasks>-->
+ <!--</configuration>-->
+ <!--<goals>-->
+ <!--<goal>run</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
<plugin>
<!--Static -->
<artifactId>maven-antrun-plugin</artifactId>
@@ -371,7 +388,7 @@
<directory>/var/lib/ambari-server/resources/stacks/HDP</directory>
<sources>
<source>
- <location>target/classes/stacks/HDP</location>
+ <location>src/main/resources/stacks/HDP</location>
</source>
</sources>
</mapping>
@@ -380,7 +397,7 @@
<configuration>noreplace</configuration>
<sources>
<source>
- <location>target/classes/stacks/HDPLocal</location>
+ <location>src/main/resources/stacks/HDPLocal</location>
</source>
</sources>
</mapping>
@@ -482,45 +499,7 @@
</goals>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>set-hdp-url-classes</id>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="ambari-server-compile">
- <exec dir="${basedir}" executable="sh" failonerror="true">
- <arg value="${basedir}/set-hdp-repo-url.sh"/>
- <arg value="${hdpUrlForCentos6}"/>
- </exec>
- </target>
- </configuration>
- </execution>
- <execution>
- <id>set-hdp-url-packages</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="ambari-server-compile">
- <exec dir="${basedir}" executable="sh" failonerror="true">
- <arg value="${basedir}/set-hdp-repo-url.sh"/>
- <arg value="${hdpUrlForCentos6}"/>
- <arg value="${project.build.directory}/ambari-server-${project.version}-dist/ambari-server-${project.version}"/>
- </exec>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/19d572cf/ambari-server/set-hdp-repo-url.sh
----------------------------------------------------------------------
diff --git a/ambari-server/set-hdp-repo-url.sh b/ambari-server/set-hdp-repo-url.sh
deleted file mode 100644
index 1f2e084..0000000
--- a/ambari-server/set-hdp-repo-url.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-
-if [ "$1" != '${hdpUrlForCentos6}' ]
-then
- # Updating for new stack version:
- # Create the new stack definition with parameterized repoinfo.xml files.
- # Typically, copying the files from the previous version will work.
- # Modify the VERSION variable in this file to match the new version
- # Modify the previous version to store concrete public repo url
-
- VERSION=2.0.6
- C6URL="$1"
- C5URL="${C6URL/centos6/centos5}"
- S11URL="${C6URL/centos6/suse11}"
-
- if [ "$#" != 2 ]
- then
- HDPREPO=target/classes/stacks/HDP/${VERSION}/repos
- HDPLOCALREPO=target/classes/stacks/HDPLocal/${VERSION}/repos
- else
- HDPREPO=$2/var/lib/ambari-server/resources/stacks/HDP/${VERSION}/repos
- HDPLOCALREPO=$2/var/lib/ambari-server/resources/stacks/HDPLocal/${VERSION}/repos
- fi
-
- echo "Processing '${HDPREPO}/repoinfo.xml' and '${HDPLOCALREPO}/repoinfo.xml'"
- echo "$2"
-
- echo "Setting centos5 stack url to '$C5URL'"
- sed "s;REPLACE_WITH_CENTOS5_URL;$C5URL;" ${HDPREPO}/repoinfo.xml > ${HDPREPO}/repoinfo.xml.tmp; mv ${HDPREPO}/repoinfo.xml.tmp ${HDPREPO}/repoinfo.xml
- sed "s;REPLACE_WITH_CENTOS5_URL;$C5URL;" ${HDPLOCALREPO}/repoinfo.xml > ${HDPLOCALREPO}/repoinfo.xml.tmp; mv ${HDPLOCALREPO}/repoinfo.xml.tmp ${HDPLOCALREPO}/repoinfo.xml
-
- echo "Setting centos6 stack url to '$C6URL'"
- sed "s;REPLACE_WITH_CENTOS6_URL;$C6URL;" ${HDPREPO}/repoinfo.xml > ${HDPREPO}/repoinfo.xml.tmp; mv ${HDPREPO}/repoinfo.xml.tmp ${HDPREPO}/repoinfo.xml
- sed "s;REPLACE_WITH_CENTOS6_URL;$C6URL;" ${HDPLOCALREPO}/repoinfo.xml > ${HDPLOCALREPO}/repoinfo.xml.tmp; mv ${HDPLOCALREPO}/repoinfo.xml.tmp ${HDPLOCALREPO}/repoinfo.xml
-
- echo "Setting suse11 stack url to '$S11URL'"
- sed "s;REPLACE_WITH_SUSE11_URL;$S11URL;" ${HDPREPO}/repoinfo.xml > ${HDPREPO}/repoinfo.xml.tmp; mv ${HDPREPO}/repoinfo.xml.tmp ${HDPREPO}/repoinfo.xml
- sed "s;REPLACE_WITH_SUSE11_URL;$S11URL;" ${HDPLOCALREPO}/repoinfo.xml > ${HDPLOCALREPO}/repoinfo.xml.tmp; mv ${HDPLOCALREPO}/repoinfo.xml.tmp ${HDPLOCALREPO}/repoinfo.xml
-fi
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/19d572cf/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
index 09f1834..d926412 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/repos/repoinfo.xml
@@ -18,56 +18,56 @@
<reposinfo>
<os type="centos6">
<repo>
- <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos6</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="centos5">
<repo>
- <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos5</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat6">
<repo>
- <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos6</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat5">
<repo>
- <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos5</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux6">
<repo>
- <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos6</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux5">
<repo>
- <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos5</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="suse11">
<repo>
- <baseurl>REPLACE_WITH_SUSE11_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/suse11</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="sles11">
<repo>
- <baseurl>REPLACE_WITH_SUSE11_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/suse11</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/19d572cf/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/repos/repoinfo.xml
index 09f1834..d926412 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/repos/repoinfo.xml
@@ -18,56 +18,56 @@
<reposinfo>
<os type="centos6">
<repo>
- <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos6</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="centos5">
<repo>
- <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos5</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat6">
<repo>
- <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos6</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="redhat5">
<repo>
- <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos5</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux6">
<repo>
- <baseurl>REPLACE_WITH_CENTOS6_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos6</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="oraclelinux5">
<repo>
- <baseurl>REPLACE_WITH_CENTOS5_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/centos5</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="suse11">
<repo>
- <baseurl>REPLACE_WITH_SUSE11_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/suse11</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>
</os>
<os type="sles11">
<repo>
- <baseurl>REPLACE_WITH_SUSE11_URL</baseurl>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP-2.0.6.0/repos/suse11</baseurl>
<repoid>HDP-2.0.6</repoid>
<reponame>HDP</reponame>
</repo>