Skip to content

Commit

Permalink
Run cd ../kubevirt && make bump-kubevirtci
Browse files Browse the repository at this point in the history
Signed-off-by: kubevirt-bot <kubevirtbot@redhat.com>
  • Loading branch information
kubevirt-bot committed Jun 27, 2021
1 parent b18c47d commit e49184a
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 503 deletions.
2 changes: 1 addition & 1 deletion cluster-up-sha.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3ec4a334d8d5391c59f8576296f55c5991b1fa04
3a67f5b4adf070fa930e839f0477ed2a236fe70c
11 changes: 5 additions & 6 deletions cluster-up/cluster/ephemeral-provider-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ set -e

KUBEVIRT_WITH_ETC_IN_MEMORY=${KUBEVIRT_WITH_ETC_IN_MEMORY:-false}
KUBEVIRT_WITH_ETC_CAPACITY=${KUBEVIRT_WITH_ETC_CAPACITY:-none}
KUBEVIRTCI_VERBOSE=${KUBEVIRTCI_VERBOSE:-true}

if [ -z "${KUBEVIRTCI_TAG}" ] && [ -z "${KUBEVIRTCI_GOCLI_CONTAINER}" ]; then
echo "FATAL: either KUBEVIRTCI_TAG or KUBEVIRTCI_GOCLI_CONTAINER must be set"
>&2 echo "FATAL: either KUBEVIRTCI_TAG or KUBEVIRTCI_GOCLI_CONTAINER must be set"
exit 1
fi

if [ -n "${KUBEVIRTCI_TAG}" ] && [ -n "${KUBEVIRTCI_GOCLI_CONTAINER}" ]; then
echo "WARNING: KUBEVIRTCI_GOCLI_CONTAINER is set and will take precedence over the also set KUBEVIRTCI_TAG"
>&2 echo "WARNING: KUBEVIRTCI_GOCLI_CONTAINER is set and will take precedence over the also set KUBEVIRTCI_TAG"
fi

if [ "${KUBEVIRTCI_RUNTIME}" = "podman" ]; then
Expand All @@ -25,13 +24,13 @@ else
if curl --unix-socket /${HOME}/podman.sock http://d/v3.0.0/libpod/info >/dev/null 2>&1; then
_cri_bin=podman
_docker_socket="${HOME}/podman.sock"
[ "$KUBEVIRTCI_VERBOSE" = 'true' ] && echo "selecting podman as container runtime"
>&2 echo "selecting podman as container runtime"
elif docker ps >/dev/null; then
_cri_bin=docker
_docker_socket="/var/run/docker.sock"
[ "$KUBEVIRTCI_VERBOSE" = 'true' ] && echo "selecting docker as container runtime"
>&2 echo "selecting docker as container runtime"
else
echo "no working container runtime found. Neither docker nor podman seems to work."
>&2 echo "no working container runtime found. Neither docker nor podman seems to work."
exit 1
fi
fi
Expand Down
45 changes: 0 additions & 45 deletions cluster-up/cluster/k8s-1.16/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions cluster-up/cluster/k8s-1.16/provider.sh

This file was deleted.

57 changes: 0 additions & 57 deletions cluster-up/cluster/k8s-1.17/README.md

This file was deleted.

152 changes: 0 additions & 152 deletions cluster-up/cluster/k8s-1.17/dev-guide.md

This file was deleted.

3 changes: 0 additions & 3 deletions cluster-up/cluster/k8s-1.17/provider.sh

This file was deleted.

81 changes: 0 additions & 81 deletions cluster-up/cluster/k8s-1.18/README.md

This file was deleted.

Loading

0 comments on commit e49184a

Please sign in to comment.