diff --git a/.gitlab/cerno.yml b/.gitlab/cerno.yml index 6f723daa166..e00985e7d25 100644 --- a/.gitlab/cerno.yml +++ b/.gitlab/cerno.yml @@ -11,6 +11,7 @@ modules: reconcile_proposal: true team_key: MCORE project_template: "MCore CI Testing" + linear_issue_status: "Need Triage" enable_linear_open: true enable_linear_modify: true enable_linear_close: true diff --git a/docker/Dockerfile.linting b/docker/Dockerfile.linting index e9a4de80455..bbaa8a9250c 100644 --- a/docker/Dockerfile.linting +++ b/docker/Dockerfile.linting @@ -24,7 +24,7 @@ RUN --mount=type=secret,id=JET_INDEX_URLS \ # Keep this in the internal-only stage so public CI has no internal service dependency. ARG CI_SERVER_URL -ARG CERNO_COMMIT=5a5fb5360e67f8f09d189871bbc0d768c09c43fa +ARG CERNO_COMMIT=edda1ff3878c4722cdd51cccbebff1fa8fd63ebd RUN --mount=type=secret,id=CERNO_TOKEN \ GIT_CONFIG_COUNT=1 \ GIT_CONFIG_KEY_0=http.extraHeader \ diff --git a/tests/test_utils/test_ci_triage.py b/tests/test_utils/test_ci_triage.py index 626013c73ef..9427343a0a8 100644 --- a/tests/test_utils/test_ci_triage.py +++ b/tests/test_utils/test_ci_triage.py @@ -121,15 +121,18 @@ def test_error_extraction_is_opt_in_for_generated_jobs( def test_cerno_hard_cutover_contract(): pipeline = yaml.safe_load(Path(".gitlab-ci.yml").read_text()) + config = yaml.safe_load(Path(".gitlab/cerno.yml").read_text()) triage = Path(".gitlab/stages/06.triage.yml").read_text() dockerfile = Path("docker/Dockerfile.linting").read_text() build_script = Path(".gitlab/scripts/build.sh").read_text() assert pipeline["variables"]["CERNO_CONFIG"] == ".gitlab/cerno.yml" + assert config["report_artifacts"] == {} + assert config["error_extraction"]["resolution_configs"] == {} assert triage.count("cerno-linear") == 3 assert triage.count("cerno-notify") == 2 assert triage.count('--config "${CERNO_CONFIG}"') == 3 - assert "ARG CERNO_COMMIT=5a5fb5360e67f8f09d189871bbc0d768c09c43fa" in dockerfile + assert "ARG CERNO_COMMIT=edda1ff3878c4722cdd51cccbebff1fa8fd63ebd" in dockerfile assert '"cerno @ git+${CI_SERVER_URL}/dl/nemo/cerno.git@${CERNO_COMMIT}"' in dockerfile assert "id=CERNO_TOKEN" in dockerfile assert "/run/secrets/CERNO_TOKEN" in dockerfile @@ -396,6 +399,7 @@ def test_triage_config_selects_megatron_and_enables_write_actions(): "reconcile_proposal": True, "team_key": "MCORE", "project_template": "MCore CI Testing", + "linear_issue_status": "Need Triage", "enable_linear_open": True, "enable_linear_modify": True, "enable_linear_close": True, @@ -405,6 +409,7 @@ def test_triage_config_selects_megatron_and_enables_write_actions(): assert linear_write.write_gates(config) == { linear_ci.LINEAR_MODULE: {"open": True, "modify": True, "close": True} } + assert linear_write.issue_statuses(config) == {linear_ci.LINEAR_MODULE: "Need Triage"} def test_slack_followup_uses_upstream_detailed_and_execution_summaries():