clean up config file

1 files changed, 104 insertions, 110 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 19a6a1a4c..9ae8c5c01 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,113 +58,110 @@ workflows:
             parameters:
               platform: ["amd64", "arm64", "mac_amd64"]
 
-      # - test:
-      #     name: << matrix.platform >>_test
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters: &filters-default
-      #       branches:
-      #         ignore:
-      #           - /rel\/.*/
-      #           - /hotfix\/.*/
-
-      # - test_nightly:
-      #     name: << matrix.platform >>_test_nightly
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters: &filters-nightly
-      #       branches:
-      #         only:
-      #           - /rel\/.*/
-      #           - /hotfix\/.*/
-      #     context: slack-secrets
-
-      # - integration:
-      #     name: << matrix.platform >>_integration
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters:
-      #       <<: *filters-default
-
-      # - integration_nightly:
-      #     name: << matrix.platform >>_integration_nightly
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters:
-      #       <<: *filters-nightly
-      #     context: slack-secrets
-
-      # - e2e_expect:
-      #     name: << matrix.platform >>_e2e_expect
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters:
-      #       <<: *filters-default
-
-      # - e2e_expect_nightly:
-      #     name: << matrix.platform >>_e2e_expect_nightly
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters:
-      #       <<: *filters-nightly
-      #     context: slack-secrets
-
-      # - e2e_subs:
-      #     name: << matrix.platform >>_e2e_subs
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters:
-      #       <<: *filters-default
-
-      # - e2e_subs_nightly:
-      #     name: << matrix.platform >>_e2e_subs_nightly
-      #     matrix:
-      #       <<: *matrix-default
-      #     requires:
-      #       - << matrix.platform >>_build
-      #     filters:
-      #       <<: *filters-nightly
-      #     context: slack-secrets
-
-      # - tests_verification_job:
-      #     name: << matrix.platform >>_<< matrix.job_type >>_verification
-      #     matrix:
-      #       parameters:
-      #         platform: ["amd64", "arm64", "mac_amd64"]
-      #         job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"]
-      #     requires:
-      #       - << matrix.platform >>_<< matrix.job_type >>
+      - test:
+          name: << matrix.platform >>_test
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters: &filters-default
+            branches:
+              ignore:
+                - /rel\/.*/
+                - /hotfix\/.*/
+
+      - test_nightly:
+          name: << matrix.platform >>_test_nightly
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters: &filters-nightly
+            branches:
+              only:
+                - /rel\/.*/
+                - /hotfix\/.*/
+          context: slack-secrets
+
+      - integration:
+          name: << matrix.platform >>_integration
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters:
+            <<: *filters-default
+
+      - integration_nightly:
+          name: << matrix.platform >>_integration_nightly
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters:
+            <<: *filters-nightly
+          context: slack-secrets
+
+      - e2e_expect:
+          name: << matrix.platform >>_e2e_expect
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters:
+            <<: *filters-default
+
+      - e2e_expect_nightly:
+          name: << matrix.platform >>_e2e_expect_nightly
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters:
+            <<: *filters-nightly
+          context: slack-secrets
+
+      - e2e_subs:
+          name: << matrix.platform >>_e2e_subs
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters:
+            <<: *filters-default
+
+      - e2e_subs_nightly:
+          name: << matrix.platform >>_e2e_subs_nightly
+          matrix:
+            <<: *matrix-default
+          requires:
+            - << matrix.platform >>_build
+          filters:
+            <<: *filters-nightly
+          context: slack-secrets
+
+      - tests_verification_job:
+          name: << matrix.platform >>_<< matrix.job_type >>_verification
+          matrix:
+            parameters:
+              platform: ["amd64", "arm64", "mac_amd64"]
+              job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"]
+          requires:
+            - << matrix.platform >>_<< matrix.job_type >>
 
       - upload_nightly_binaries:
           name: << matrix.platform >>_upload_nightly_binaries
           matrix:
             <<: *matrix-default
           requires:
-            - << matrix.platform >>_build
-          # requires:
-          #   - << matrix.platform >>_test_nightly_verification
-          #   - << matrix.platform >>_integration_nightly_verification
-          #   - << matrix.platform >>_e2e_expect_nightly_verification
-          #   - << matrix.platform >>_e2e_subs_nightly
-          #   - codegen_verification
+            - << matrix.platform >>_test_nightly_verification
+            - << matrix.platform >>_integration_nightly_verification
+            - << matrix.platform >>_e2e_expect_nightly_verification
+            - << matrix.platform >>_e2e_subs_nightly
+            - codegen_verification
           filters:
             branches:
               only:
-                - "circleci/1809"
                 - "rel/nightly"
           context:
             - slack-secrets
@@ -175,17 +172,14 @@ workflows:
           matrix:
             <<: *matrix-default
           requires:
-            - << matrix.platform >>_build
-          # requires:
-          #   - << matrix.platform >>_test_nightly_verification
-          #   - << matrix.platform >>_integration_nightly_verification
-          #   - << matrix.platform >>_e2e_expect_nightly_verification
-          #   - << matrix.platform >>_e2e_subs_nightly
-          #   - codegen_verification
+            - << matrix.platform >>_test_nightly_verification
+            - << matrix.platform >>_integration_nightly_verification
+            - << matrix.platform >>_e2e_expect_nightly_verification
+            - << matrix.platform >>_e2e_subs_nightly
+            - codegen_verification
           filters:
             branches:
               only:
-                # - "circleci/1809"
                 - "rel/beta"
                 - "rel/stable"
           context:
@@ -732,8 +726,8 @@ jobs:
       - upload_binaries_command:
           platform: << parameters.platform >>
           no_build: "false"
-      # - slack/notify:
-      #     <<: *slack-fail-event
+      - slack/notify:
+          <<: *slack-fail-event
 
   upload_nightly_binaries:
     working_directory: << pipeline.parameters.build_dir >>/project
@@ -747,5 +741,5 @@ jobs:
       - upload_binaries_command:
           platform: << parameters.platform >>
           no_build: "true"
-      # - slack/notify:
-      #     <<: *slack-fail-event
\ No newline at end of file
+      - slack/notify:
+          <<: *slack-fail-event
\ No newline at end of file