Skip to content

Commit

Permalink
add a regression test param which includes tests which we don't need …
Browse files Browse the repository at this point in the history
…to run every PR, but are still useful to run on master
  • Loading branch information
hawkowl authored and slawande2 committed Oct 2, 2024
1 parent 05dd307 commit c7aa493
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TAG ?= $(shell git describe --exact-match 2>/dev/null)
COMMIT = $(shell git rev-parse --short=7 HEAD)$(shell [[ $$(git status --porcelain) = "" ]] || echo -dirty)
ARO_IMAGE_BASE = ${RP_IMAGE_ACR}.azurecr.io/aro
E2E_FLAGS ?= -test.v --ginkgo.v --ginkgo.timeout 180m --ginkgo.flake-attempts=2 --ginkgo.junit-report=e2e-report.xml
E2E_LABEL ?= !smoke
E2E_LABEL ?= !smoke&&!regressiontest
GO_FLAGS ?= -tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper

export GOFLAGS=$(GO_FLAGS)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/adminapi_redeployvm.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const (
uptimeStrFmt = "2006-01-02 15:04:05" // https://go.dev/src/time/format.go
)

var _ = Describe("[Admin API] VM redeploy action", func() {
var _ = Describe("[Admin API] VM redeploy action", Label(regressiontest), func() {
BeforeEach(skipIfNotInDevelopmentEnv)

It("must trigger a selected VM to redeploy", func(ctx context.Context) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const (
resolvConfContainerName = "read-resolv-conf"
)

var _ = Describe("ARO cluster DNS", func() {
var _ = Describe("ARO cluster DNS", Label(regressiontest), func() {
BeforeEach(skipIfNotInDevelopmentEnv)

It("must not be adversely affected by Azure host servicing", func(ctx context.Context) {
Expand Down
4 changes: 4 additions & 0 deletions test/e2e/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ import (

const (
smoke = "smoke"
// regressiontest is for tests designed to ensure that something doesn't
// break before we go to release, but doesn't need to be validated in every
// PR.
regressiontest = "regressiontest"
)

//go:embed static_resources
Expand Down

0 comments on commit c7aa493

Please sign in to comment.