Address PR feedback for combining integ tests

Signed-off-by: Tanner Lewis <[email protected]>

.github/workflows/rfs_pr_e2e_test.yml → .github/workflows/full_pr_e2e_test.yml

@@ -34,6 +34,6 @@ jobs:
         uses: lewijacn/[email protected]
         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 }}"

jenkins/migrationIntegPipelines/fullDefaultE2ETestCover.groovy → 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()

vars/fullDefaultE2ETest.groovy → 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.<STAGE>.local:9201 --target_proxy_alb_endpoint https://alb.migration.<STAGE>.local:9202'
     )
 }

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'

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'