From e5c0b233b54b37fb7e680854165f02553a906921 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Wed, 31 Jul 2024 19:45:05 +0530 Subject: [PATCH] fix: cicd restore --- .circleci/config.yml | 12 +- .circleci/config_continue.yml | 276 +++++++++++++++++----------------- tests/test-server/app.py | 1 - 3 files changed, 144 insertions(+), 145 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 06db34ade..5c79bb1cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,12 +41,12 @@ workflows: version: 2 tagged-build: jobs: - - create-test-jobs: {} - # filters: - # tags: - # only: /dev-v[0-9]+(\.[0-9]+)*/ - # branches: - # only: /test-cicd\/.*/ + - create-test-jobs: + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ - publish: context: - slack-notification diff --git a/.circleci/config_continue.yml b/.circleci/config_continue.yml index 126768d24..d60e7b65d 100644 --- a/.circleci/config_continue.yml +++ b/.circleci/config_continue.yml @@ -268,155 +268,155 @@ workflows: version: 2 tagged-build: jobs: - - test-dev-tag-as-not-passed: {} - # filters: - # tags: - # only: /dev-v[0-9]+(\.[0-9]+)*/ - # branches: - # only: /test-cicd\/.*/ - # - test-unit: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # matrix: - # parameters: - # cdi-version: placeholder + - test-dev-tag-as-not-passed: + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + - test-unit: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + matrix: + parameters: + cdi-version: placeholder - test-backend-sdk-testing: requires: - test-dev-tag-as-not-passed context: - slack-notification - # filters: - # tags: - # only: /dev-v[0-9]+(\.[0-9]+)*/ - # branches: - # only: /test-cicd\/.*/ + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ matrix: parameters: cdi-version: placeholder fdi-version: placeholder - # - test-website-fastapi: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # - test-website-flask: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # - test-website-django: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # - test-website-drf-async: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # - test-website-drf-sync: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # - test-website-django2x: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # - test-authreact-fastapi: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # matrix: - # parameters: - # fdi-version: placeholder - # - test-authreact-flask: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # matrix: - # parameters: - # fdi-version: placeholder - # - test-authreact-django: - # requires: - # - test-dev-tag-as-not-passed - # context: - # - slack-notification - # # filters: - # # tags: - # # only: /dev-v[0-9]+(\.[0-9]+)*/ - # # branches: - # # only: /test-cicd\/.*/ - # matrix: - # parameters: - # fdi-version: placeholder + - test-website-fastapi: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + - test-website-flask: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + - test-website-django: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + - test-website-drf-async: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + - test-website-drf-sync: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + - test-website-django2x: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + - test-authreact-fastapi: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + matrix: + parameters: + fdi-version: placeholder + - test-authreact-flask: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + matrix: + parameters: + fdi-version: placeholder + - test-authreact-django: + requires: + - test-dev-tag-as-not-passed + context: + - slack-notification + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ + matrix: + parameters: + fdi-version: placeholder - test-success: requires: - # - test-unit + - test-unit - test-backend-sdk-testing - # - test-website-fastapi - # - test-website-flask - # - test-website-django - # - test-website-drf-async - # - test-website-drf-sync - # - test-website-django2x - # - test-authreact-fastapi - # - test-authreact-flask - # - test-authreact-django + - test-website-fastapi + - test-website-flask + - test-website-django + - test-website-drf-async + - test-website-drf-sync + - test-website-django2x + - test-authreact-fastapi + - test-authreact-flask + - test-authreact-django context: - slack-notification - # filters: - # tags: - # only: /dev-v[0-9]+(\.[0-9]+)*/ - # branches: - # only: /test-cicd\/.*/ + filters: + tags: + only: /dev-v[0-9]+(\.[0-9]+)*/ + branches: + only: /test-cicd\/.*/ diff --git a/tests/test-server/app.py b/tests/test-server/app.py index f998eef88..f743a56fe 100644 --- a/tests/test-server/app.py +++ b/tests/test-server/app.py @@ -381,7 +381,6 @@ def reset_override_params(): @app.route("/test/getoverridelogs", methods=["GET"]) # type: ignore def get_override_logs(): - print(override_logging.override_logs) return jsonify({"logs": override_logging.override_logs})