From 927cb2fad69f7e5baa519229aa1ae8da9b30fa87 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Wed, 16 Jun 2021 19:49:37 +0000 Subject: tcwg-cleanup-stale-containers: Remove special handling of bmk boards Now that we have switched to pools of bmk boards, each board will have a normal jenkins container /running on the board/. For benchmarking purposes this container will be stopped for the duration of benchmarking, and then restarted. Change-Id: Ie0b6b5564fb35fee178cada689a8c9996e4ea1c6 --- tcwg-cleanup-stale-containers.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tcwg-cleanup-stale-containers.yaml b/tcwg-cleanup-stale-containers.yaml index 3203527684..a7d65eff9c 100644 --- a/tcwg-cleanup-stale-containers.yaml +++ b/tcwg-cleanup-stale-containers.yaml @@ -84,18 +84,6 @@ Cleaning stale containers on $NODE_NAME. Please check console output at $BUILD_URL to view the results EOF - maybe_ssh="" - case "$NODE_NAME" in - tcwg-bmk-bkp-*) ;; - tcwg-bmk-stm32-*) ;; - tcwg-bmk-*) - # Copy jenkins-scripts to benchmarking boards, - # and run cleanups remotely. - board="tcwg-${NODE_NAME#tcwg-bmk-}.tcwglab" - rsync -az --del --rsync-path "mkdir -p $WORKSPACE/; rsync" $WORKSPACE/ $board:$WORKSPACE/ - maybe_ssh="ssh $board" - ;; - esac case "$NODE_NAME" in tcwg-bmk-bkp-*) ;; tcwg-bmk-*|tcwg-x86_64-dev-*-short) @@ -110,7 +98,7 @@ tcwg-x86_64-dev-*-short) exit 0 ;; esac - $maybe_ssh $WORKSPACE/tcwg-cleanup-stale-containers.sh --cleanup-running-hours $cleanup_running_hours --cleanup-stopped-hours $cleanup_stopped_hours --cleanup-ssh-agent-hours $cleanup_ssh_agent_hours --cleanup-volumes $cleanup_volumes --cleanup-images $cleanup_images --verbose $verbose + $WORKSPACE/tcwg-cleanup-stale-containers.sh --cleanup-running-hours $cleanup_running_hours --cleanup-stopped-hours $cleanup_stopped_hours --cleanup-ssh-agent-hours $cleanup_ssh_agent_hours --cleanup-volumes $cleanup_volumes --cleanup-images $cleanup_images --verbose $verbose publishers: - email-ext: recipients: tcwg-validation@linaro.org -- cgit v1.2.3