diff --git a/.github/workflows/rfs_pr_e2e_test.yml b/.github/workflows/full_pr_e2e_test.yml similarity index 96% rename from .github/workflows/rfs_pr_e2e_test.yml rename to .github/workflows/full_pr_e2e_test.yml index caafe6a8f..aab80a6d1 100644 --- a/.github/workflows/rfs_pr_e2e_test.yml +++ b/.github/workflows/full_pr_e2e_test.yml @@ -34,6 +34,6 @@ jobs: uses: lewijacn/jenkins-trigger@1.0.4 with: jenkins_url: "https://migrations.ci.opensearch.org" - job_name: "rfs-default-e2e-test" + job_name: "full-es68source-e2e-test" api_token: "${{ secrets.JENKINS_MIGRATIONS_GENERIC_WEBHOOK_TOKEN }}" job_params: "GIT_REPO_URL=${{ steps.sanitize-input.outputs.pr_repo_url }},GIT_BRANCH=${{ steps.sanitize-input.outputs.branch_name }}" diff --git a/jenkins/migrationIntegPipelines/fullDefaultE2ETestCover.groovy b/jenkins/migrationIntegPipelines/fullES68SourceE2ETestCover.groovy similarity index 72% rename from jenkins/migrationIntegPipelines/fullDefaultE2ETestCover.groovy rename to jenkins/migrationIntegPipelines/fullES68SourceE2ETestCover.groovy index 97e10dc21..26510e681 100644 --- a/jenkins/migrationIntegPipelines/fullDefaultE2ETestCover.groovy +++ b/jenkins/migrationIntegPipelines/fullES68SourceE2ETestCover.groovy @@ -5,5 +5,5 @@ library identifier: "migrations-lib@${gitBranch}", retriever: modernSCM( [$class: 'GitSCMSource', remote: "${gitUrl}"]) -// Shared library function (location from root: vars/fullDefaultE2ETest.groovy) -fullDefaultE2ETest() +// Shared library function (location from root: vars/fullES68SourceE2ETest.groovy) +fullES68SourceE2ETest() diff --git a/jenkins/migrationIntegPipelines/rfsES68SourceE2ETestCover.groovy b/jenkins/migrationIntegPipelines/rfsES68SourceE2ETestCover.groovy deleted file mode 100644 index b0801a90d..000000000 --- a/jenkins/migrationIntegPipelines/rfsES68SourceE2ETestCover.groovy +++ /dev/null @@ -1,9 +0,0 @@ -def gitBranch = params.GIT_BRANCH ?: 'main' -def gitUrl = params.GIT_REPO_URL ?: 'https://github.com/opensearch-project/opensearch-migrations.git' - -library identifier: "migrations-lib@${gitBranch}", retriever: modernSCM( - [$class: 'GitSCMSource', - remote: "${gitUrl}"]) - -// Shared library function (location from root: vars/rfsES68SourceE2ETest.groovy) -rfsES68SourceE2ETest() diff --git a/vars/fullDefaultE2ETest.groovy b/vars/fullES68SourceE2ETest.groovy similarity index 96% rename from vars/fullDefaultE2ETest.groovy rename to vars/fullES68SourceE2ETest.groovy index 79afbd1e2..73bec0c20 100644 --- a/vars/fullDefaultE2ETest.groovy +++ b/vars/fullES68SourceE2ETest.groovy @@ -65,9 +65,9 @@ def call(Map config = [:]) { migrationContext: migration_cdk_context, sourceContextId: sourceContextId, migrationContextId: migrationContextId, - defaultStageId: 'full-integ', + defaultStageId: 'full-es68', skipCaptureProxyOnNodeSetup: true, - jobName: 'full-default-e2e-test', + jobName: 'full-es68source-e2e-test', integTestCommand: '/root/lib/integ_test/integ_test/full_tests.py --source_proxy_alb_endpoint https://alb.migration..local:9201 --target_proxy_alb_endpoint https://alb.migration..local:9202' ) } diff --git a/vars/rfsDefaultE2ETest.groovy b/vars/rfsDefaultE2ETest.groovy index 5a5115e55..f0aea12ab 100644 --- a/vars/rfsDefaultE2ETest.groovy +++ b/vars/rfsDefaultE2ETest.groovy @@ -1,6 +1,4 @@ -// Note: -// 1. There is a still a manual step needed on the EC2 source load balancer to replace its security group rule which allows all traffic (0.0.0.0/0) to -// allow traffic for the relevant service security group. This needs a better story around accepting user security groups in our Migration CDK. +// Note: This integ test exists to verify that RFS can be ran independently of other migrations def call(Map config = [:]) { def sourceContextId = 'source-single-node-ec2' diff --git a/vars/rfsES68SourceE2ETest.groovy b/vars/rfsES68SourceE2ETest.groovy deleted file mode 100644 index cb047acbd..000000000 --- a/vars/rfsES68SourceE2ETest.groovy +++ /dev/null @@ -1,71 +0,0 @@ - -def call(Map config = [:]) { - def sourceContextId = 'source-single-node-ec2' - def migrationContextId = 'migration-rfs' - def source_cdk_context = """ - { - "source-single-node-ec2": { - "suffix": "ec2-source-", - "networkStackSuffix": "ec2-source-", - "distVersion": "6.8.23", - "distributionUrl": "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.8.23.tar.gz", - "captureProxyEnabled": false, - "securityDisabled": true, - "minDistribution": false, - "cpuArch": "x64", - "isInternal": true, - "singleNodeCluster": true, - "networkAvailabilityZones": 2, - "dataNodeCount": 1, - "managerNodeCount": 0, - "serverAccessType": "ipv4", - "restrictServerAccessTo": "0.0.0.0/0" - } - } - """ - def migration_cdk_context = """ - { - "migration-rfs": { - "stage": "", - "vpcId": "", - "engineVersion": "OS_2.11", - "domainName": "os-cluster-", - "dataNodeCount": 2, - "openAccessPolicyEnabled": true, - "domainRemovalPolicy": "DESTROY", - "artifactBucketRemovalPolicy": "DESTROY", - "trafficReplayerServiceEnabled": false, - "reindexFromSnapshotServiceEnabled": true, - "sourceClusterEndpoint": "", - "sourceCluster": { - "endpoint": "", - "auth": {"type": "none"}, - "version": "ES_6.8.23" - }, - "tlsSecurityPolicy": "TLS_1_2", - "enforceHTTPS": true, - "nodeToNodeEncryptionEnabled": true, - "encryptionAtRestEnabled": true, - "vpcEnabled": true, - "vpcAZCount": 2, - "domainAZCount": 2, - "mskAZCount": 2, - "migrationAssistanceEnabled": true, - "replayerOutputEFSRemovalPolicy": "DESTROY", - "migrationConsoleServiceEnabled": true, - "otelCollectorEnabled": true - } - } - """ - - defaultIntegPipeline( - sourceContext: source_cdk_context, - migrationContext: migration_cdk_context, - sourceContextId: sourceContextId, - migrationContextId: migrationContextId, - defaultStageId: 'rfs-integ-es68', - skipCaptureProxyOnNodeSetup: true, - jobName: 'rfs-es68source-e2e-test', - integTestCommand: '/root/lib/integ_test/integ_test/backfill_tests_es68.py' - ) -} diff --git a/vars/trafficReplayDefaultE2ETest.groovy b/vars/trafficReplayDefaultE2ETest.groovy index e2822bbd7..174b57d37 100644 --- a/vars/trafficReplayDefaultE2ETest.groovy +++ b/vars/trafficReplayDefaultE2ETest.groovy @@ -1,6 +1,4 @@ -// Note: -// 1. There is a still a manual step needed on the EC2 source load balancer to replace its security group rule which allows all traffic (0.0.0.0/0) to -// allow traffic for the relevant service security group. This needs a better story around accepting user security groups in our Migration CDK. +// Note: This integ test exists to verify that Capture and Replay can be ran independently of other migrations def call(Map config = [:]) { def sourceContextId = 'source-single-node-ec2'