incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1328151 - in /incubator/bigtop/trunk: bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/ bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/ bigtop-tests/test-artifacts/package/src...
Date Thu, 19 Apr 2012 23:37:07 GMT
Author: rvs
Date: Thu Apr 19 23:37:07 2012
New Revision: 1328151

URL: http://svn.apache.org/viewvc?rev=1328151&view=rev
Log:
BIGTOP-545. package testing manifest in trunk needs to be updated

Modified:
    incubator/bigtop/trunk/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml

Modified: incubator/bigtop/trunk/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy?rev=1328151&r1=1328150&r2=1328151&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy
(original)
+++ incubator/bigtop/trunk/bigtop-test-framework/src/main/groovy/org/apache/bigtop/itest/pmanager/AptCmdLinePackageManager.groovy
Thu Apr 19 23:37:07 2012
@@ -29,16 +29,17 @@ class AptCmdLinePackageManager extends P
      shRoot.exec("debconf-set-selections <<__EOT__\n${defaults}\n__EOT__");
   }
 
-  public int addBinRepo(String record, String url, String key) {
+  // FIXME: Debian doesn't have a way ot passing a full description
+  // of the repository that also includes a GPG key -- we have to workaround
+  public int addBinRepo(String record, String desc, String key) {
     if (key) {
       def text = key.toURL().text;
       shRoot.exec("apt-key add - <<__EOT__\n${text}\n__EOT__");
-      if (shRoot.getRet()) {
+      if (shRoot.getRet() != 0) {
         return shRoot.getRet();
       }
-    } else {
-      return addBinRepo(record, url);
     }
+    return addBinRepo(record, desc);
   }
 
   public int addBinRepo(String record, String url, String key, String cookie) {

Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy?rev=1328151&r1=1328150&r2=1328151&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy
(original)
+++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy
Thu Apr 19 23:37:07 2012
@@ -72,7 +72,7 @@ class PackageTestRepoMgr {
     pm.cleanup();
     try {
       String repoText = cdhRepoFileURL.toURL().text;
-      if (pm.addBinRepo(repoName, repoText, cdhKeyURL)) {
+      if (pm.addBinRepo(repoName, repoText, cdhKeyURL) != 0) {
         return false;
       }
 

Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml?rev=1328151&r1=1328150&r2=1328151&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
(original)
+++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
Thu Apr 19 23:37:07 2012
@@ -2166,7 +2166,7 @@
     <zookeeper>
       <home>/var/lib/zookeeper</home>
       <descr>ZooKeeper</descr>
-      <shell>/bin/false</shell>
+      <shell>/sbin/nologin</shell>
     </zookeeper>
   </users>
   <deps>
@@ -6880,7 +6880,7 @@
     <hbase>
       <home>/var/run/hbase</home>
       <descr>HBase</descr>
-      <shell>/bin/bash</shell>
+      <shell>/sbin/nologin</shell>
     </hbase>
   </users>
   <deps>

Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml?rev=1328151&r1=1328150&r2=1328151&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
(original)
+++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
Thu Apr 19 23:37:07 2012
@@ -109,7 +109,7 @@
       <zookeeper>
         <home>/var/lib/zookeeper</home>
         <descr>ZooKeeper</descr>
-        <shell>/bin/false</shell>
+        <shell>/sbin/nologin</shell>
       </zookeeper>
     </users>
     <deps>
@@ -161,7 +161,7 @@
       <hbase>
         <home>/var/run/hbase</home>
         <descr>HBase</descr>
-        <shell>/bin/bash</shell>
+        <shell>/sbin/nologin</shell>
       </hbase>
     </users>
     <deps>

Modified: incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml?rev=1328151&r1=1328150&r2=1328151&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
(original)
+++ incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
Thu Apr 19 23:37:07 2012
@@ -109,7 +109,7 @@
     <zookeeper>
       <home>/var/lib/zookeeper</home>
       <descr>ZooKeeper</descr>
-      <shell>/bin/false</shell>
+      <shell>/sbin/nologin</shell>
     </zookeeper>
   </users>
   <deps>
@@ -161,7 +161,7 @@
     <hbase>
       <home>/var/run/hbase</home>
       <descr>HBase</descr>
-      <shell>/bin/bash</shell>
+      <shell>/sbin/nologin</shell>
     </hbase>
   </users>
   <deps>



Mime
View raw message