brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjcorb...@apache.org
Subject [2/4] incubator-brooklyn git commit: yum fix - Add EPEL if missing
Date Tue, 14 Jul 2015 09:37:17 GMT
yum fix - Add EPEL if missing

- This fixes installation of nodejs for CentOS 7
  and the NodeJsWebAppFixtureIntegrationTest respectively


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dbeef918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dbeef918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dbeef918

Branch: refs/heads/master
Commit: dbeef9187d9a5e7907f7bd9e58ac68173c8b0f3d
Parents: 407c7a1
Author: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Authored: Fri Jun 26 15:52:00 2015 +0300
Committer: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Committed: Mon Jun 29 14:36:46 2015 +0300

----------------------------------------------------------------------
 utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java     | 1 +
 .../src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dbeef918/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java b/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java
index 21b87d1..570551d 100644
--- a/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java
+++ b/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java
@@ -376,6 +376,7 @@ public class BashCommands {
                     chainGroup(
                         "echo yum exists, doing update",
                         ok(sudo("yum check-update")),
+                        ok(sudo("yum -y install epel-release")),
                         sudo(yumInstall))));
         if (brewInstall != null)
             commands.add(ifExecutableElse1("brew", brewInstall));

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dbeef918/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java b/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
index afec6be..7d90dbf 100644
--- a/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
@@ -40,7 +40,7 @@ public class IptablesCommandsTest {
     private static final String saveIptablesRules = "( ( if test \"$UID\" -eq 0; then ( service
iptables save ); else sudo -E -n -S -- service iptables save; fi ) || " +
             "( ( { which zypper && { echo zypper exists, doing refresh &&
(( if test \"$UID\" -eq 0; then ( zypper --non-interactive --no-gpg-checks refresh ); else
sudo -E -n -S -- zypper --non-interactive --no-gpg-checks refresh; fi ) || true) &&
( if test \"$UID\" -eq 0; then ( zypper --non-interactive --no-gpg-checks install iptables-persistent
); else sudo -E -n -S -- zypper --non-interactive --no-gpg-checks install iptables-persistent;
fi ) ; } ; } || " +
             "{ which apt-get && { echo apt-get exists, doing update && export
DEBIAN_FRONTEND=noninteractive && (( if test \"$UID\" -eq 0; then ( apt-get update
); else sudo -E -n -S -- apt-get update; fi ) || true) && ( if test \"$UID\" -eq 0;
then ( apt-get install -y --allow-unauthenticated iptables-persistent ); else sudo -E -n -S
-- apt-get install -y --allow-unauthenticated iptables-persistent; fi ) ; } ; } || " +
-            "{ which yum && { echo yum exists, doing update && (( if test
\"$UID\" -eq 0; then ( yum check-update ); else sudo -E -n -S -- yum check-update; fi ) ||
true) && ( if test \"$UID\" -eq 0; then ( yum -y --nogpgcheck install iptables-persistent
); else sudo -E -n -S -- yum -y --nogpgcheck install iptables-persistent; fi ) ; } ; } ||
" +
+            "{ which yum && { echo yum exists, doing update && (( if test
\"$UID\" -eq 0; then ( yum check-update ); else sudo -E -n -S -- yum check-update; fi ) ||
true) && (( if test \"$UID\" -eq 0; then ( yum -y install epel-release ); else sudo
-E -n -S -- yum -y install epel-release; fi ) || true) && ( if test \"$UID\" -eq 0;
then ( yum -y --nogpgcheck install iptables-persistent ); else sudo -E -n -S -- yum -y --nogpgcheck
install iptables-persistent; fi ) ; } ; } || " +
             "{ which brew && brew install iptables-persistent ; } || " +
             "{ which port && ( if test \"$UID\" -eq 0; then ( port install iptables-persistent
); else sudo -E -n -S -- port install iptables-persistent; fi ) ; } || " +
             "(( echo \"WARNING: no known/successful package manager to install iptables-persistent,
may fail subsequently\" | tee /dev/stderr ) || true) ) && ( if test \"$UID\" -eq 0;
then ( /etc/init.d/iptables-persistent save ); else sudo -E -n -S -- /etc/init.d/iptables-persistent
save; fi ) ) )";


Mime
View raw message