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

Commit

Permalink
[7.15](backport #1928) Update main branch (#1933)
Browse files Browse the repository at this point in the history
* Update main branch (#1928)

(cherry picked from commit 304c97f)

# Conflicts:
#	.ci/build-docker-images.groovy
#	.ci/e2eKibana.groovy
#	.ci/jobs/build-docker-images.yml
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.ci/jobs/fleet-server-e2e-tests.yml
#	.ci/jobs/kibana-e2e-tests.yml
#	.mergify.yml

* use main version for mergify and jjbb

* chore: remove pipelines that are not triggered in maintenance branches

Co-authored-by: Victor Martinez <[email protected]>
Co-authored-by: Manuel de la Peña <[email protected]>
  • Loading branch information
3 people authored Dec 20, 2021
1 parent 3e3a7fe commit d6daa47
Show file tree
Hide file tree
Showing 15 changed files with 115 additions and 473 deletions.
6 changes: 3 additions & 3 deletions .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pipeline {
issueCommentTrigger("${obltGitHubComments()}")
}
parameters {
booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
booleanParam(name: 'Run_As_Main_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on main branch.')
booleanParam(name: "SKIP_SCENARIOS", defaultValue: true, description: "If it's needed to skip those scenarios marked as @skip. Default true")
booleanParam(name: "NIGHTLY_SCENARIOS", defaultValue: false, description: "If it's needed to include the scenarios marked as @nightly in the test execution. Default false")
string(name: 'runTestsSuites', defaultValue: '', description: 'A comma-separated list of test suites to run (default: empty to run all test suites)')
Expand Down Expand Up @@ -460,10 +460,10 @@ def generateFunctionalTestStep(Map args = [:]){

// TODO: Is this still relevant?
if (isPR() || isUpstreamTrigger(filter: 'PR-')) {
// when the "Run_As_Master_Branch" param is disabled, we will honour the PR filters, which
// when the "Run_As_Main_Branch" param is disabled, we will honour the PR filters, which
// basically exclude some less frequent platforms or operative systems. If the user enabled
// this param, the pipeline will remove the filters from the test runner.
if (!params.Run_As_Master_Branch) {
if (!params.Run_As_Main_Branch) {
tags += pullRequestFilter
}
}
Expand Down
94 changes: 0 additions & 94 deletions .ci/build-docker-images.groovy

This file was deleted.

192 changes: 0 additions & 192 deletions .ci/e2eFleetServer.groovy

This file was deleted.

Loading

0 comments on commit d6daa47

Please sign in to comment.