Sweep old scheduler code

.bumpversion.cfg

@@ -16,8 +16,6 @@ serialize =
 
 [bumpversion:file:airbyte-metrics/reporter/Dockerfile]
 
-[bumpversion:file:airbyte-scheduler/app/Dockerfile]
-
 [bumpversion:file:airbyte-server/Dockerfile]
 
 [bumpversion:file:airbyte-webapp/package.json]

.github/workflows/gradle.yml

@@ -521,11 +521,11 @@ jobs:
           label: ${{ needs.start-platform-build-runner.outputs.label }}
           ec2-instance-id: ${{ needs.start-platform-build-runner.outputs.ec2-instance-id }}
 
-  ## Kube Acceptance Tests (with scheduler v2 - both temporal changes and container orchestrator)
+  ## Kube Acceptance Tests
   # Docker acceptance tests run as part of the build job.
   # In case of self-hosted EC2 errors, remove this block.
-  start-kube-acceptance-test-runner-v2:
-    name: "Platform: Start Scheduler V2 Kube Acceptance Test Runner"
+  start-kube-acceptance-test-runner:
+    name: "Platform: Start Kube Acceptance Test Runner"
     needs:
       - changes
       - find_valid_pat
@@ -548,11 +548,11 @@ jobs:
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           github-token: ${{ needs.find_valid_pat.outputs.pat }}
-  kube-acceptance-test-v2:
-    name: "Platform: Acceptance Tests (Kube v2)"
+  kube-acceptance-test:
+    name: "Platform: Acceptance Tests (Kube)"
     # In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest.
-    needs: start-kube-acceptance-test-runner-v2 # required to start the main job when the runner is ready
-    runs-on: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.label }} # run the job on the newly created runner
+    needs: start-kube-acceptance-test-runner # required to start the main job when the runner is ready
+    runs-on: ${{ needs.start-kube-acceptance-test-runner.outputs.label }} # run the job on the newly created runner
     environment: more-secrets
     timeout-minutes: 90
     steps:
@@ -631,17 +631,17 @@ jobs:
           name: Kubernetes Logs
           path: /tmp/kubernetes_logs/*
   # In case of self-hosted EC2 errors, remove this block.
-  stop-kube-acceptance-test-runner-v2:
+  stop-kube-acceptance-test-runner:
     name: "Platform: Stop Kube Acceptance Test EC2 Runner"
     timeout-minutes: 10
     needs:
-      - start-kube-acceptance-test-runner-v2 # required to get output from the start-runner job
-      - kube-acceptance-test-v2 # required to wait when the main job is done
+      - start-kube-acceptance-test-runner # required to get output from the start-runner job
+      - kube-acceptance-test # required to wait when the main job is done
       - find_valid_pat
     runs-on: ubuntu-latest
     # Always is required to stop the runner even if the previous job has errors. However always() runs even if the previous step is skipped.
     # Thus, we check for skipped here.
-    if: ${{ always() && needs.start-kube-acceptance-test-runner-v2.result != 'skipped'}}
+    if: ${{ always() && needs.start-kube-acceptance-test-runner.result != 'skipped'}}
     steps:
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -654,8 +654,8 @@ jobs:
         with:
           mode: stop
           github-token: ${{ needs.find_valid_pat.outputs.pat }}
-          label: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.label }}
-          ec2-instance-id: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.ec2-instance-id }}
+          label: ${{ needs.start-kube-acceptance-test-runner.outputs.label }}
+          ec2-instance-id: ${{ needs.start-kube-acceptance-test-runner.outputs.ec2-instance-id }}
 
   notify-failure-slack-channel:
     name: "Notify Slack Channel on Build Failures"
@@ -665,7 +665,7 @@ jobs:
       - frontend-build
       - octavia-cli-build
       - platform-build
-      - kube-acceptance-test-v2
+      - kube-acceptance-test
     if: ${{ failure() && github.ref == 'refs/heads/master' }}
     steps:
       - name: Publish to OSS Build Failure Slack Channel
@@ -689,7 +689,7 @@ jobs:
       - frontend-build
       - octavia-cli-build
       - platform-build
-      - kube-acceptance-test-v2
+      - kube-acceptance-test
     if: success()
     steps:
       - name: Get Previous Workflow Status

airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderAppTest.java

@@ -100,7 +100,6 @@ void testBootloaderAppBlankDb() throws Exception {
     when(mockedConfigs.getJobsDatabaseInitializationTimeoutMs()).thenReturn(60000L);
 
     val mockedFeatureFlags = mock(FeatureFlags.class);
-    when(mockedFeatureFlags.usesNewScheduler()).thenReturn(false);
 
     val mockedSecretMigrator = mock(SecretMigrator.class);
 
@@ -157,7 +156,6 @@ void testBootloaderAppRunSecretMigration() throws Exception {
     when(mockedConfigs.getJobsDatabaseInitializationTimeoutMs()).thenReturn(60000L);
 
     val mockedFeatureFlags = mock(FeatureFlags.class);
-    when(mockedFeatureFlags.usesNewScheduler()).thenReturn(false);
 
     final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
         .copySecrets(true)
@@ -302,7 +300,6 @@ void testPostLoadExecutionExecutes() throws Exception {
     when(mockedConfigs.getJobsDatabaseInitializationTimeoutMs()).thenReturn(60000L);
 
     val mockedFeatureFlags = mock(FeatureFlags.class);
-    when(mockedFeatureFlags.usesNewScheduler()).thenReturn(false);
 
     val mockedSecretMigrator = mock(SecretMigrator.class);
 

airbyte-commons/src/main/java/io/airbyte/commons/features/EnvVariableFeatureFlags.java

@@ -9,15 +9,6 @@
 @Slf4j
 public class EnvVariableFeatureFlags implements FeatureFlags {
 
-  @Override
-  public boolean usesNewScheduler() {
-    // TODO: sweep this method along with the scheduler
-    log.info("New Scheduler: true (post-migration)");
-
-    // After migrating all OSS users onto the new temporal scheduler, this should always return true.
-    return true;
-  }
-
   @Override
   public boolean autoDisablesFailingConnections() {
     log.info("Auto Disable Failing Connections: " + Boolean.parseBoolean(System.getenv("AUTO_DISABLE_FAILING_CONNECTIONS")));

airbyte-commons/src/main/java/io/airbyte/commons/features/FeatureFlags.java

@@ -10,8 +10,6 @@
  */
 public interface FeatureFlags {
 
-  boolean usesNewScheduler();
-
   boolean autoDisablesFailingConnections();
 
   boolean exposeSecretsInExport();

airbyte-metrics/lib/src/main/java/io/airbyte/metrics/lib/MetricEmittingApps.java

@@ -22,7 +22,6 @@
 public enum MetricEmittingApps implements MetricEmittingApp {
 
   METRICS_REPORTER("metrics-reporter"),
-  SCHEDULER("scheduler"),
   WORKER("worker");
 
   private String applicationName;