Skip to content

Commit aaa7f0d

Browse files
committed
Simplify e2e fixture test configuration
- Remove unnecessary libvirt installation from fixture workflow - Set `automated-cleaning` as default skip label in Makefile for fixture tests - Override skip labels in CI e2e script to run all tests - Add `tools/bin` to clean target - Document fixture test defaults in Makefile comments Signed-off-by: Lennart Jern <lennart.jern@est.tech>
1 parent 5a65e4a commit aaa7f0d

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/e2e-fixture-test.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ jobs:
2424
with:
2525
go-version: ${{ steps.vars.outputs.go_version }}
2626

27-
- name: Install libvirt
28-
run: |
29-
sudo apt-get update
30-
sudo apt-get install -y libvirt-dev
31-
3227
- name: Build BMO e2e Docker Image
3328
env:
3429
IMG: quay.io/metal3-io/baremetal-operator
@@ -38,9 +33,7 @@ jobs:
3833
- name: Set Up Environment and Run BMO e2e Tests
3934
env:
4035
E2E_CONF_FILE: ${{ github.workspace }}/test/e2e/config/fixture.yaml
41-
USE_EXISTING_CLUSTER: "false"
4236
GINKGO_NODES: 1
43-
GINKGO_SKIP_LABELS: "automated-cleaning"
4437
run: make test-e2e
4538

4639
- name: Upload artifacts

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ export GOFLAGS=
4949
#
5050
# Ginkgo configuration.
5151
#
52+
# We default to fixture tests, since they are fast and require little
53+
# both in terms of resources and tooling.
54+
# Note that some tests may not make sense for fixture, so we skip them.
5255
GINKGO_FOCUS ?=
5356
GINKGO_SKIP ?=
54-
GINKGO_SKIP_LABELS ?=
57+
GINKGO_SKIP_LABELS ?= automated-cleaning
5558
GINKGO_NODES ?= 2
5659
GINKGO_TIMEOUT ?= 3h
5760
GINKGO_POLL_PROGRESS_AFTER ?= 60m
@@ -444,6 +447,7 @@ clean: ## Remove all temporary files, directories and tools
444447
rm -rf ironic-deployment/overlays/temp
445448
rm -rf config/overlays/temp
446449
rm -rf $(TOOLS_BIN_DIR)
450+
rm -rf tools/bin
447451

448452
.PHONY: clean-e2e
449453
clean-e2e: ## Remove everything related to e2e tests

hack/ci-e2e.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ echo "BMO_E2E_EMULATOR=${BMO_E2E_EMULATOR}"
3535
export E2E_CONF_FILE="${REPO_ROOT}/test/e2e/config/ironic.yaml"
3636
export E2E_BMCS_CONF_FILE="${REPO_ROOT}/test/e2e/config/bmcs-${BMC_PROTOCOL}.yaml"
3737

38+
# make test-e2e runs the fixture tests by default and skips some tests
39+
# that don't make sense in that context. We need to override.
40+
export GINKGO_SKIP_LABELS="${GINKGO_SKIP_LABELS:-}"
3841
GINKGO_FOCUS="${GINKGO_FOCUS:-}"
3942

4043
case "${GINKGO_FOCUS,,}" in

0 commit comments

Comments
 (0)