Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

chore: move skip responsibility to the automation, not the CI #528

Merged
merged 2 commits into from
Dec 3, 2020
Merged

chore: move skip responsibility to the automation, not the CI #528

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
9229587
chore: move skip responsibility to the automation, not the CI
mdelapenya Dec 3, 2020
001fe18
chore: support skipping scenarios from Jenkins UI
mdelapenya Dec 3, 2020
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
6 changes: 3 additions & 3 deletions .ci/.e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ SUITES:
- suite: "helm"
tags: "metricbeat"
- suite: "fleet"
tags: "agent_endpoint_integration && ~skip"
tags: "agent_endpoint_integration"
- suite: "fleet"
tags: "stand_alone_agent && ~skip"
tags: "stand_alone_agent"
- suite: "fleet"
tags: "fleet_mode_agent && ~skip"
tags: "fleet_mode_agent"
- suite: "metricbeat"
tags: "integrations && apache"
- suite: "metricbeat"
Expand Down
2 changes: 2 additions & 0 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ pipeline {
issueCommentTrigger('(?i).*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*')
}
parameters {
booleanParam(name: "SKIP_SCENARIOS", defaultValue: true, description: "If it's needed to skip those scenarios marked as @skip. Default true")
string(name: 'runTestsSuites', defaultValue: '', description: 'A comma-separated list of test suites to run (default: empty to run all test suites)')
booleanParam(name: "forceSkipGitChecks", defaultValue: false, description: "If it's needed to check for Git changes to filter by modified sources")
booleanParam(name: "forceSkipPresubmit", defaultValue: false, description: "If it's needed to execute the pre-submit tests: unit and precommit.")
Expand Down Expand Up @@ -56,6 +57,7 @@ pipeline {
HOME = "${env.WORKSPACE}"
PATH = "${env.PATH}:${env.WORKSPACE}/bin:${env.WORKSPACE}/${env.BASE_DIR}/.ci/scripts"
GO111MODULE = 'on'
SKIP_SCENARIOS = "${params.SKIP_SCENARIOS}"
SLACK_CHANNEL = "${params.SLACK_CHANNEL.trim()}"
ELASTIC_AGENT_DOWNLOAD_URL = "${params.ELASTIC_AGENT_DOWNLOAD_URL.trim()}"
ELASTIC_AGENT_VERSION = "${params.ELASTIC_AGENT_VERSION.trim()}"
Expand Down
6 changes: 6 additions & 0 deletions e2e/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,18 @@ FORMAT?=pretty
LOG_INCLUDE_TIMESTAMP?=TRUE
LOG_LEVEL?=INFO
TIMEOUT_FACTOR?=3
#true by default, allowing developers to set SKIP_SCENARIOS=false
SKIP_SCENARIOS?=true
STACK_VERSION?=
PICKLES_VERSION?="2.20.1"
VERSION_VALUE=`cat ../cli/VERSION.txt`

ifneq ($(TAGS),)
TAGS_FLAG=--tags
ifeq ($(SKIP_SCENARIOS),true)
## We always want to skip scenarios tagged with @skip
TAGS+= && ~skip
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I quoted the value here, but it ended up adding them to the value instead

endif
endif

GO_IMAGE_TAG?='stretch'
Expand Down