Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't run long-running regression tests on PRs #3875

Merged
merged 2 commits into from
Oct 1, 2024
Merged

Don't run long-running regression tests on PRs #3875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f69705b
add a regression test param which includes tests which we don't need …
hawkowl Oct 1, 2024
396adb0
run regressiontests on CI (i.e. not PR runs)
hawkowl Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .pipelines/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ jobs:
make extract-aro-docker
displayName: Extract ARO binaries from build

# Override the E2E label for IndividualCI/BatchedCI (i.e. not manually
# ran/PR jobs) to run all non-smoke tasks (default is !smoke&&!regressiontest)
- script: |
echo "##vso[task.setvariable variable=E2E_LABEL]!smoke"
displayName: Enable regression tests in CI
condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')

- script: |
az account set -s $AZURE_SUBSCRIPTION_ID
SECRET_SA_ACCOUNT_NAME=$(SECRET_SA_ACCOUNT_NAME) make secrets
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading