Skip to content

Commit

Permalink
remove obvious duplication
Browse files Browse the repository at this point in the history
  • Loading branch information
sgsullivan committed Aug 4, 2022
1 parent d6e7139 commit fd0c8f2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 2 additions & 0 deletions integration_tests/lib/common
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

BEFEHL_DOCKER_CMD=${BEFEHL_DOCKER_CMD:-sudo docker}

function clear_befehl_sshd_containers {
local ids_to_clear=$($BEFEHL_DOCKER_CMD ps -a |grep befehl_sshd_|awk '{print $1}')
[[ -n $ids_to_clear ]] && echo "$ids_to_clear"|xargs $BEFEHL_DOCKER_CMD rm --force || echo "nothing to clear"
Expand Down
2 changes: 0 additions & 2 deletions integration_tests/nuke_sshd_hosts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ set -eux

source integration_tests/lib/common

BEFEHL_DOCKER_CMD=${BEFEHL_DOCKER_CMD:-sudo docker}

clear_befehl_sshd_containers
1 change: 0 additions & 1 deletion integration_tests/start_sshd_hosts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ source integration_tests/lib/common

SSH_HOSTS=$1
STARTING_SSHD_PORT=1000
BEFEHL_DOCKER_CMD=${BEFEHL_DOCKER_CMD:-sudo docker}

function build_sshd_image {
$BEFEHL_DOCKER_CMD build -t befehl-sshd integration_tests/docker
Expand Down

0 comments on commit fd0c8f2

Please sign in to comment.