From 2ccf937beba282a849a1cf296f93b10bb087b4a4 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 19 Jul 2023 12:26:21 +0200 Subject: [PATCH] Remove MacOS daily tests --- .ci/e2eTestingMacosDaily.groovy | 147 ----------------------------- .ci/jobs/e2e-testing-macos-mbp.yml | 45 --------- 2 files changed, 192 deletions(-) delete mode 100644 .ci/e2eTestingMacosDaily.groovy delete mode 100644 .ci/jobs/e2e-testing-macos-mbp.yml diff --git a/.ci/e2eTestingMacosDaily.groovy b/.ci/e2eTestingMacosDaily.groovy deleted file mode 100644 index 9d36f0ac6d..0000000000 --- a/.ci/e2eTestingMacosDaily.groovy +++ /dev/null @@ -1,147 +0,0 @@ -#!/usr/bin/env groovy - -@Library('apm@current') _ - -pipeline { - agent { label 'macos12 && x86_64' } - environment { - REPO = 'e2e-testing' - BASE_DIR = "src/github.com/elastic/${env.REPO}" - ELASTIC_APM_ACTIVE = "true" - ELASTIC_APM_ENVIRONMENT = "ci" - ELASTIC_APM_LOG_FILE = "stderr" - ELASTIC_APM_LOG_LEVEL = "debug" - NOTIFY_TO = credentials('notify-to') - PROVIDER = 'remote' - BEAT_VERSION = "${params.BEAT_VERSION.trim()}" - ELASTIC_AGENT_VERSION = "${params.ELASTIC_AGENT_VERSION.trim()}" - ELASTIC_STACK_VERSION = "${params.ELASTIC_STACK_VERSION.trim()}" - GITHUB_CHECK_REPO = "${params.GITHUB_CHECK_REPO.trim()}" - GITHUB_CHECK_SHA1 = "${params.GITHUB_CHECK_SHA1.trim()}" - CLUSTER_NAME = "e2e-testing-${BUILD_ID}-${BRANCH_NAME}-${ELASTIC_STACK_VERSION.replaceAll('\\.', '-')}" - LOG_LEVEL = "${params.LOG_LEVEL}" - GO111MODULE = 'on' - TAGS = "fleet_mode && install" - } - options { - timeout(time: 120, unit: 'MINUTES') - buildDiscarder(logRotator(numToKeepStr: '200', artifactNumToKeepStr: '30', daysToKeepStr: '30')) - timestamps() - ansiColor('xterm') - disableResume() - durabilityHint('PERFORMANCE_OPTIMIZED') - rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true]) - quietPeriod(10) - } - parameters { - string(name: 'ELASTIC_AGENT_VERSION', defaultValue: "8.9.0-SNAPSHOT", description: 'SemVer version of the Elastic Agent to be used for the tests. You can use here the tag of your PR to test your changes') - string(name: 'ELASTIC_STACK_VERSION', defaultValue: "8.9.0-SNAPSHOT", description: 'SemVer version of the stack to be used for the tests.') - string(name: 'BEAT_VERSION', defaultValue: "8.9.0-SNAPSHOT", description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes') - string(name: 'GITHUB_CHECK_REPO', defaultValue: '', description: 'Name of the GitHub repo to be updated. Only modified if this build is triggered from another parent stream (i.e. Beats).') - string(name: 'GITHUB_CHECK_SHA1', defaultValue: '', description: 'Git SHA for the Beats upstream project (branch or PR)') - choice(name: 'LOG_LEVEL', choices: ['TRACE', 'DEBUG', 'INFO'], description: 'Log level to be used') - choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies') - } - stages { - stage('Checkout') { - options { skipDefaultCheckout() } - steps { - deleteDir() - gitCheckout(basedir: BASE_DIR, githubNotifyFirstTimeContributor: true) - stash(allowEmpty: true, name: 'source', useDefaultExcludes: false) - setEnvVar("GO_VERSION", readFile("${env.WORKSPACE}/${env.BASE_DIR}/.go-version").trim()) - } - } - stage('Create cluster') { - options { skipDefaultCheckout() } - steps { - echo "CLUSTER_NAME=${env.CLUSTER_NAME}" - createCluster() - } - } - stage('Functional Test') { - options { skipDefaultCheckout() } - environment { - E2E_SUITES = "e2e/_suites" - FORMAT = "pretty,cucumber:fleet_mode.json,junit:fleet_mode.xml" - STACK_VERSION = "${env.ELASTIC_STACK_VERSION}" - } - steps { - withGithubNotify(context: 'Functional Test - MacOS', tab: 'tests') { - withGoEnv(version: "${GO_VERSION}"){ - withClusterEnv(cluster: env.CLUSTER_NAME, fleet: true, kibana: true, elasticsearch: true) { - withOtelEnv() { - sh(label: 'run fleet', script: 'make --no-print-directory -C "${BASE_DIR}/${E2E_SUITES}/fleet" functional-test') - } - } - } - } - } - post { - failure { - // Notify test failures if the Functional Test stage failed only - // therefore any other failures with the cluster creation/destroy - // won't report any slack message. - setEnvVar('SLACK_NOTIFY', true) - } - always { - junit(allowEmptyResults: true, keepLongStdio: true, testResults: "${BASE_DIR}/${E2E_SUITES}/**/*.xml") - archiveArtifacts(allowEmptyArchive: true, artifacts: "${BASE_DIR}/${E2E_SUITES}/**/*.xml") - } - } - } - } - post { - always { - destroyCluster() - } - cleanup { - notifyBuildResult(prComment: true, - slackHeader: "*Test Suite (MacOS)*: ${env.TAGS}", - slackChannel: "ingest-notifications", - slackComment: true, - slackNotify: doSlackNotify()) - } - } -} - -def doSlackNotify() { - if (env.SLACK_NOTIFY?.equals('true')) { - return true - } - return false -} - -def createCluster() { - withVaultEnv(){ - dir("${BASE_DIR}") { - sshagent(credentials: ["f6c7695a-671e-4f4f-a331-acdce44ff9ba"]) { - sh ".ci/scripts/deployment.sh 'create'" - } - } - } -} - -def destroyCluster() { - withVaultEnv(){ - dir("${BASE_DIR}") { - sshagent(credentials: ["f6c7695a-671e-4f4f-a331-acdce44ff9ba"]) { - sh ".ci/scripts/deployment.sh 'destroy'" - } - } - } -} - -def withVaultEnv(Closure body){ - getVaultSecret.readSecretWrapper { - withEnvMask(vars: [ - [var: 'VAULT_ADDR', password: env.VAULT_ADDR], - [var: 'VAULT_ROLE_ID', password: env.VAULT_ROLE_ID], - [var: 'VAULT_SECRET_ID', password: env.VAULT_SECRET_ID], - [var: 'VAULT_AUTH_METHOD', password: 'approle'], - [var: 'VAULT_AUTHTYPE', password: 'approle'] - ]){ - body() - } - } -} diff --git a/.ci/jobs/e2e-testing-macos-mbp.yml b/.ci/jobs/e2e-testing-macos-mbp.yml deleted file mode 100644 index 9c276e5a6e..0000000000 --- a/.ci/jobs/e2e-testing-macos-mbp.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -- job: - name: e2e-tests/e2e-testing-macos-daily-mbp - display-name: End-2-End tests for Observability MacOS Pipeline - description: Run E2E MacOS test suite daily, including maintenance branches - view: E2E - project-type: multibranch - script-path: .ci/e2eTestingMacosDaily.groovy - scm: - - github: - branch-discovery: no-pr - head-filter-regex: '(main|8\.\d|7\.17|PR-.*|feature-.*)' - discover-pr-forks-strategy: merge-current - discover-pr-forks-trust: permission - discover-pr-origin: merge-current - discover-tags: false - notification-context: 'beats-ci/e2e-testing' - disable-pr-notifications: true - repo: e2e-testing - repo-owner: elastic - credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken - ssh-checkout: - credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba - property-strategies: - all-branches: - - suppress-scm-triggering: true - build-strategies: - - regular-branches: true - - change-request: - ignore-target-only-changes: true - clean: - after: true - before: true - prune: true - shallow-clone: true - depth: 3 - do-not-fetch-tags: true - submodule: - disable: false - recursive: true - parent-credentials: true - timeout: 100 - timeout: '15' - use-author: true - wipe-workspace: true