mirror of
https://github.com/siderolabs/talos.git
synced 2025-09-17 03:41:11 +02:00
chore: stop using sonobuoy CLI
We already have (better) way to run short conformance tests via `talosctl`. Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
parent
6ad4595197
commit
9bd4838ac1
@ -133,7 +133,6 @@ local setup_ci = {
|
|||||||
|
|
||||||
commands: [
|
commands: [
|
||||||
'setup-ci',
|
'setup-ci',
|
||||||
'make ./_out/sonobuoy',
|
|
||||||
'make ./_out/kubectl',
|
'make ./_out/kubectl',
|
||||||
],
|
],
|
||||||
environment: {
|
environment: {
|
||||||
|
10
Makefile
10
Makefile
@ -28,8 +28,6 @@ INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERAT
|
|||||||
KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.22.2/bin/$(OPERATING_SYSTEM)/amd64/kubectl
|
KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.22.2/bin/$(OPERATING_SYSTEM)/amd64/kubectl
|
||||||
CLUSTERCTL_VERSION ?= 0.4.3
|
CLUSTERCTL_VERSION ?= 0.4.3
|
||||||
CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64
|
CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64
|
||||||
SONOBUOY_VERSION ?= 0.53.1
|
|
||||||
SONOBUOY_URL ?= https://github.com/vmware-tanzu/sonobuoy/releases/download/v$(SONOBUOY_VERSION)/sonobuoy_$(SONOBUOY_VERSION)_$(OPERATING_SYSTEM)_amd64.tar.gz
|
|
||||||
TESTPKGS ?= github.com/talos-systems/talos/...
|
TESTPKGS ?= github.com/talos-systems/talos/...
|
||||||
RELEASES ?= v0.11.5 v0.12.1
|
RELEASES ?= v0.11.5 v0.12.1
|
||||||
SHORT_INTEGRATION_TEST ?=
|
SHORT_INTEGRATION_TEST ?=
|
||||||
@ -292,11 +290,6 @@ $(ARTIFACTS)/$(INTEGRATION_TEST_DEFAULT_TARGET)-amd64:
|
|||||||
$(ARTIFACTS)/$(INTEGRATION_TEST_PROVISION_DEFAULT_TARGET)-amd64:
|
$(ARTIFACTS)/$(INTEGRATION_TEST_PROVISION_DEFAULT_TARGET)-amd64:
|
||||||
@$(MAKE) local-$(INTEGRATION_TEST_PROVISION_DEFAULT_TARGET) DEST=$(ARTIFACTS) PLATFORM=linux/amd64 WITH_RACE=true NAME=Client
|
@$(MAKE) local-$(INTEGRATION_TEST_PROVISION_DEFAULT_TARGET) DEST=$(ARTIFACTS) PLATFORM=linux/amd64 WITH_RACE=true NAME=Client
|
||||||
|
|
||||||
$(ARTIFACTS)/sonobuoy:
|
|
||||||
@mkdir -p $(ARTIFACTS)
|
|
||||||
@curl -L -o /tmp/sonobuoy.tar.gz ${SONOBUOY_URL}
|
|
||||||
@tar -xf /tmp/sonobuoy.tar.gz -C $(ARTIFACTS)
|
|
||||||
|
|
||||||
$(ARTIFACTS)/kubectl:
|
$(ARTIFACTS)/kubectl:
|
||||||
@mkdir -p $(ARTIFACTS)
|
@mkdir -p $(ARTIFACTS)
|
||||||
@curl -L -o $(ARTIFACTS)/kubectl "$(KUBECTL_URL)"
|
@curl -L -o $(ARTIFACTS)/kubectl "$(KUBECTL_URL)"
|
||||||
@ -307,7 +300,7 @@ $(ARTIFACTS)/clusterctl:
|
|||||||
@curl -L -o $(ARTIFACTS)/clusterctl "$(CLUSTERCTL_URL)"
|
@curl -L -o $(ARTIFACTS)/clusterctl "$(CLUSTERCTL_URL)"
|
||||||
@chmod +x $(ARTIFACTS)/clusterctl
|
@chmod +x $(ARTIFACTS)/clusterctl
|
||||||
|
|
||||||
e2e-%: $(ARTIFACTS)/$(INTEGRATION_TEST_DEFAULT_TARGET)-amd64 $(ARTIFACTS)/sonobuoy $(ARTIFACTS)/kubectl $(ARTIFACTS)/clusterctl ## Runs the E2E test for the specified platform (e.g. e2e-docker).
|
e2e-%: $(ARTIFACTS)/$(INTEGRATION_TEST_DEFAULT_TARGET)-amd64 $(ARTIFACTS)/kubectl $(ARTIFACTS)/clusterctl ## Runs the E2E test for the specified platform (e.g. e2e-docker).
|
||||||
@$(MAKE) hack-test-$@ \
|
@$(MAKE) hack-test-$@ \
|
||||||
PLATFORM=$* \
|
PLATFORM=$* \
|
||||||
TAG=$(TAG) \
|
TAG=$(TAG) \
|
||||||
@ -321,7 +314,6 @@ e2e-%: $(ARTIFACTS)/$(INTEGRATION_TEST_DEFAULT_TARGET)-amd64 $(ARTIFACTS)/sonobu
|
|||||||
SHORT_INTEGRATION_TEST=$(SHORT_INTEGRATION_TEST) \
|
SHORT_INTEGRATION_TEST=$(SHORT_INTEGRATION_TEST) \
|
||||||
CUSTOM_CNI_URL=$(CUSTOM_CNI_URL) \
|
CUSTOM_CNI_URL=$(CUSTOM_CNI_URL) \
|
||||||
KUBECTL=$(PWD)/$(ARTIFACTS)/kubectl \
|
KUBECTL=$(PWD)/$(ARTIFACTS)/kubectl \
|
||||||
SONOBUOY=$(PWD)/$(ARTIFACTS)/sonobuoy \
|
|
||||||
CLUSTERCTL=$(PWD)/$(ARTIFACTS)/clusterctl
|
CLUSTERCTL=$(PWD)/$(ARTIFACTS)/clusterctl
|
||||||
|
|
||||||
provision-tests-prepare: release-artifacts $(ARTIFACTS)/$(INTEGRATION_TEST_PROVISION_DEFAULT_TARGET)-amd64
|
provision-tests-prepare: release-artifacts $(ARTIFACTS)/$(INTEGRATION_TEST_PROVISION_DEFAULT_TARGET)-amd64
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
# - TALOSCTL
|
# - TALOSCTL
|
||||||
# - INTEGRATION_TEST
|
# - INTEGRATION_TEST
|
||||||
# - KUBECTL
|
# - KUBECTL
|
||||||
# - SONOBUOY
|
|
||||||
# - SHORT_INTEGRATION_TEST
|
# - SHORT_INTEGRATION_TEST
|
||||||
# - CUSTOM_CNI_URL
|
# - CUSTOM_CNI_URL
|
||||||
# - IMAGE
|
# - IMAGE
|
||||||
@ -33,10 +32,6 @@ export TALOS_VERSION=v0.11
|
|||||||
export KUBECONFIG="${TMP}/kubeconfig"
|
export KUBECONFIG="${TMP}/kubeconfig"
|
||||||
export K8S_VERSION=${K8S_VERSION:-1.22.2}
|
export K8S_VERSION=${K8S_VERSION:-1.22.2}
|
||||||
|
|
||||||
# Sonobuoy
|
|
||||||
|
|
||||||
export SONOBUOY_MODE=${SONOBUOY_MODE:-quick}
|
|
||||||
|
|
||||||
export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
|
export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
|
||||||
export TIMEOUT=1200
|
export TIMEOUT=1200
|
||||||
export NUM_NODES=6
|
export NUM_NODES=6
|
||||||
@ -174,20 +169,7 @@ function run_kubernetes_conformance_test {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function run_kubernetes_integration_test {
|
function run_kubernetes_integration_test {
|
||||||
timeout=$(($(date +%s) + ${TIMEOUT}))
|
"${TALOSCTL}" health --run-e2e
|
||||||
until ${SONOBUOY} run \
|
|
||||||
--kubeconfig ${KUBECONFIG} \
|
|
||||||
--wait \
|
|
||||||
--skip-preflight \
|
|
||||||
--plugin e2e \
|
|
||||||
--mode ${SONOBUOY_MODE}; do
|
|
||||||
[[ $(date +%s) -gt $timeout ]] && exit 1
|
|
||||||
echo "re-attempting to run sonobuoy"
|
|
||||||
${SONOBUOY} delete --all --wait --kubeconfig ${KUBECONFIG}
|
|
||||||
sleep 10
|
|
||||||
done
|
|
||||||
${SONOBUOY} status --kubeconfig ${KUBECONFIG} --json | jq . | tee ${TMP}/sonobuoy-status.json
|
|
||||||
if [ $(cat ${TMP}/sonobuoy-status.json | jq -r '.plugins[] | select(.plugin == "e2e") | ."result-status"') != 'passed' ]; then exit 1; fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function run_control_plane_cis_benchmark {
|
function run_control_plane_cis_benchmark {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user