Skip to content

Commit dcf6a48

Browse files
committed
chore: remove extra code
1 parent a0703e0 commit dcf6a48

2 files changed

Lines changed: 0 additions & 53 deletions

File tree

.buildkite/scripts/common/util.sh

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -173,46 +173,6 @@ docker_with_retry () {
173173
done
174174
}
175175

176-
force_clean_ports() {
177-
set +e
178-
179-
echo "LSOF: $(which lsof)"
180-
for port in "$@"; do
181-
echo "Force cleaning port: '$port'"
182-
183-
PORT_PID=$(lsof -i ":$port" -t)
184-
if [[ "$PORT_PID" != "" ]]; then
185-
echo "Found process using port '$port': $PORT_PID - sending SIGTERM..."
186-
kill -15 "$PORT_PID" || true
187-
sleep 5
188-
189-
PORT_PID=$(lsof -i ":$port" -t)
190-
if [[ "$PORT_PID" != "" ]]; then
191-
echo "Process $PORT_PID is still using port '$port', force killing..."
192-
kill -9 "$PORT_PID" || true
193-
fi
194-
else
195-
echo "No process found using port '$port', checking docker..."
196-
197-
ENTRY_WITH_PORT=$(docker ps -a | grep -E ":$port->")
198-
if [[ -z "$ENTRY_WITH_PORT" ]]; then
199-
echo "No docker container found using port $port"
200-
continue
201-
else
202-
CONTAINER_ID=$(echo "$ENTRY_WITH_PORT" | awk '{print $1}')
203-
echo "Found docker container using port $port: $CONTAINER_ID"
204-
echo "Stopping and removing container $CONTAINER_ID"
205-
docker stop "$CONTAINER_ID" || true
206-
docker rm "$CONTAINER_ID" || true
207-
continue
208-
fi
209-
fi
210-
done
211-
212-
set -e
213-
}
214-
215-
216176
clean_cached_images() {
217177
docker images -q | sort -u | xargs -r docker rmi -f || true
218178
docker image prune -af || true

.buildkite/scripts/steps/artifacts/docker_image.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,6 @@ else
1414
KIBANA_IMAGE_TAG="pr-$BUILDKITE_PULL_REQUEST-$GIT_ABBREV_COMMIT"
1515
fi
1616

17-
# CDN readiness file - uploaded at the very end of successful CDN asset validation
18-
CDN_READINESS_FILE="$GIT_ABBREV_COMMIT/.ready"
19-
CDN_READINESS_URL="$GCS_SA_CDN_URL/$CDN_READINESS_FILE"
20-
21-
check_cdn_assets_ready() {
22-
local url="$1"
23-
if curl --output /dev/null --silent --head --fail "$url"; then
24-
return 0
25-
else
26-
return 1
27-
fi
28-
}
29-
3017
echo "--- Clean up cached images"
3118
clean_cached_images
3219

0 commit comments

Comments
 (0)