Commit 098258b7 authored by Sandor Molnar's avatar Sandor Molnar
Browse files

Merge mozilla-central to autoland a=merge

parents 2456e873 6037f564
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ linux64/codeql-cpp:
    shipping-phase: ship
    shipping-product: firefox
    worker-type: b-linux-xlarge
    expires-after: 4 days
    worker:
        env:
            PERFHERDER_EXTRA_OPTIONS: cpp
+0 −16
Original line number Diff line number Diff line
@@ -678,19 +678,3 @@ mac-notarization:
        by-platform:
            macosx64.*: build/package/mac_osx/requirements.plist
            default: ''

expiration-policy:
    by-project:
        try:
            default: 1 month
            medium: 1 month
            long: 1 month
        autoland:
            default: 1 month
            medium: 1 year
            # To avoid keeping shippable builds for over a year
            long: 1 year
        default:
            default: 3 months
            medium: 1 year
            long: 3 years
+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ javascript:
        symbol: linux64-js
        tier: 2
    worker-type: b-linux-xlarge
    expires-after: 4 days
    worker:
        docker-image: {in-tree: debian11-amd64-build}
        max-run-time: 86400
+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ graph_config_schema = Schema(
            ): str,
            Optional("decision-parameters"): str,
        },
        Required("expiration-policy"): optionally_keyed_by("project", {str: str}),
    }
)

+0 −20
Original line number Diff line number Diff line
@@ -210,23 +210,3 @@ def enable_full_crashsymbols(config, jobs):
            logger.debug("Disabling full symbol generation for %s", job["name"])
            job["attributes"].pop("enable-full-crashsymbols", None)
        yield job


@transforms.add
def set_expiry(config, jobs):
    for job in jobs:
        attributes = job["attributes"]
        if (
            "shippable" in attributes
            and attributes["shippable"]
            and config.kind
            in {
                "build",
            }
        ):
            expiration_policy = "long"
        else:
            expiration_policy = "medium"

        job["expiration-policy"] = expiration_policy
        yield job
Loading