Skip to content

Commit 6b18fee

Browse files
ci: 🔥 remove circleci configuration and related scripts 🔥 [backport 2.21] (#13035)
All jobs are now moved to GitLab - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) (cherry picked from commit f4eb1f5) Co-authored-by: erikayasuda <[email protected]>
1 parent 8778760 commit 6b18fee

File tree

6 files changed

+0
-228
lines changed

6 files changed

+0
-228
lines changed

.circleci/config.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.riot/requirements/4d1fa34.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

riotfile.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ def select_pys(min_version: str = MIN_PYTHON_VERSION, max_version: str = MAX_PYT
111111
name="meta-testing",
112112
command="pytest {cmdargs} tests/meta",
113113
),
114-
Venv(
115-
name="circleci-gen-config",
116-
command="python scripts/gen_circleci_config.py {cmdargs}",
117-
pys=["3"],
118-
pkgs={
119-
"ruamel.yaml": latest,
120-
"lxml": latest,
121-
},
122-
),
123114
Venv(
124115
name="gitlab-gen-config",
125116
command="python scripts/gen_gitlab_config.py {cmdargs}",

scripts/gen_circleci_config.py

Lines changed: 0 additions & 145 deletions
This file was deleted.

scripts/gen_gitlab_config.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,11 @@ def gen_required_suites() -> None:
9595
git_selections=extract_git_commit_selections(os.getenv("CI_COMMIT_MESSAGE", "")),
9696
)
9797

98-
# Exclude the suites that are run in CircleCI. These likely don't run in
99-
# GitLab yet.
100-
with YAML() as yaml:
101-
circleci_config = yaml.load(ROOT / ".circleci" / "config.templ.yml")
102-
circleci_jobs = set(circleci_config["jobs"].keys())
103-
10498
# Copy the template file
10599
TESTS_GEN.write_text((GITLAB / "tests.yml").read_text())
106100
# Generate the list of suites to run
107101
with TESTS_GEN.open("a") as f:
108102
for suite in required_suites:
109-
if suite.rsplit("::", maxsplit=1)[-1] in circleci_jobs:
110-
LOGGER.debug("Skipping CircleCI suite %s", suite)
111-
continue
112-
113103
jobspec = JobSpec(suite, **suites[suite])
114104
if jobspec.skip:
115105
LOGGER.debug("Skipping suite %s", suite)
@@ -235,7 +225,6 @@ def gen_appsec_iast_packages() -> None:
235225
from pathlib import Path # noqa
236226
from time import monotonic_ns as time # noqa
237227

238-
from ruamel.yaml import YAML # noqa
239228

240229
logging.basicConfig(level=logging.WARNING, format="%(levelname)s: %(message)s")
241230
LOGGER = logging.getLogger(__name__)

tests/suitespec.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ components:
1313
- tests/__init__.py
1414
- tests/suitespec.yml
1515
- tests/suitespec.py
16-
- .circleci/*
1716
- tests/meta/*
1817
- tests/smoke_test.py
1918
- tests/subprocesstest.py

0 commit comments

Comments
 (0)