Merge branch 'master' into optimize-k6

litmuschaos · Jan 15, 2025 · 8542f2b · 8542f2b
2 parents ce2712f + c7ab5a3
commit 8542f2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -26,7 +26,8 @@ ARG LITMUS_VERSION
 RUN yum install -y \
     sudo \
     sshpass \
-    procps
+    procps \
+    openssh-clients
 
 # tc binary
 RUN yum install -y https://dl.rockylinux.org/vault/rocky/9.3/devel/$(uname -m)/os/Packages/i/iproute-6.2.0-5.el9.$(uname -m).rpm

diff --git a/chaoslib/litmus/network-chaos/helper/netem.go b/chaoslib/litmus/network-chaos/helper/netem.go
@@ -130,7 +130,7 @@ func preparePodNetworkChaos(experimentsDetails *experimentTypes.ExperimentDetail
 		}
 		log.Infof("successfully injected chaos on target: {name: %s, namespace: %v, container: %v}", t.Name, t.Namespace, t.TargetContainer)
 		if err = result.AnnotateChaosResult(resultDetails.Name, chaosDetails.ChaosNamespace, "injected", "pod", t.Name); err != nil {
-			if _, revertErr := killnetem(t, experimentsDetails.NetworkInterface); err != nil {
+			if _, revertErr := killnetem(t, experimentsDetails.NetworkInterface); revertErr != nil {
 				return cerrors.PreserveError{ErrString: fmt.Sprintf("[%s,%s]", stacktrace.RootCause(err).Error(), stacktrace.RootCause(revertErr).Error())}
 			}
 			return stacktrace.Propagate(err, "could not annotate chaosresult")