Page MenuHomePhabricator

Drop CI for REL1_31 branch once it's EOL
Closed, ResolvedPublic

Related Objects

StatusSubtypeAssignedTask
ResolvedReedy
ResolvedReedy
ResolvedReedy
Resolvedtstarling
ResolvedJdforrester-WMF
ResolvedJdforrester-WMF
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedSecurityZabe
ResolvedBUG REPORTLadsgroup
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedReedy
ResolvedMstyles
ResolvedSecuritysbassett
ResolvedSecurityRhinosF1
ResolvedSecurityLegoktm
ResolvedSecurityDannyS712
ResolvedSecurityUrbanecm_WMF
ResolvedSecuritymewoph
ResolvedSecurityUrbanecm_WMF
ResolvedSecurityUrbanecm_WMF
ResolvedSecurityTheVoidwalker
ResolvedReedy

Event Timeline

Change 683031 had a related patch set uploaded (by Jforrester; author: Jforrester):

[integration/config@master] [DNM] Zuul: Drop CI support for REL1_31 branch

https://gerrit.wikimedia.org/r/683031

Other places to remove some pieces

https://gerrit.wikimedia.org/g/integration/config/+/d1d911e5b5bf5dbe085bc00d4316ba0b325821af/jjb/assert-no-mediawiki-errors.bash#3

if [[ "$ZUUL_BRANCH" == "REL1_31" ]]; then
    echo "New rules are too cool for this branch. SKIPPED"
    exit 0
fi

https://gerrit.wikimedia.org/g/integration/config/+/d1d911e5b5bf5dbe085bc00d4316ba0b325821af/jjb/mediawiki.yaml#836

- axis:
    name: ZUUL_BRANCH
    type: user-defined
    values: &mediawiki_supported_branches
        - master
        - REL1_35
        - REL1_31

https://gerrit.wikimedia.org/g/integration/config/+/d1d911e5b5bf5dbe085bc00d4316ba0b325821af/zuul/parameter_functions.py#683

# EventStreamConfig only requires MW >= REL1_35.
# Therefore remove it from REL1_31. T249514
if (
    params['ZUUL_BRANCH'] == 'REL1_31'
    and 'EventStreamConfig' in ext_deps
):
    ext_deps.remove('EventStreamConfig')
# WikibaseCirrusSearch doesn't exist in MW == REL1_31.
# Therefore remove it from REL1_31. T258715
if (
    params['ZUUL_BRANCH'] == 'REL1_31'
    and 'WikibaseCirrusSearch' in ext_deps
):
    ext_deps.remove('WikibaseCirrusSearch')
# Score in REL1_31 doesn't need Wikibase and stuff. Considering they're
# in somewhat of a mess, it's much easier to just remove them
if (
    params['ZUUL_PROJECT'] == 'mediawiki/extensions/Score'
    and params['ZUUL_BRANCH'] == 'REL1_31'
):
    ext_deps.remove('ArticlePlaceholder')
    ext_deps.remove('PropertySuggester')
    ext_deps.remove('Wikibase')
    ext_deps.remove('WikibaseQualityConstraints')
    ext_deps.remove('WikibaseMediaInfo')
    ext_deps.remove('WikimediaBadges')
    ext_deps.remove('WikibaseLexeme')

Other places to remove some pieces

https://gerrit.wikimedia.org/g/integration/config/+/d1d911e5b5bf5dbe085bc00d4316ba0b325821af/jjb/assert-no-mediawiki-errors.bash#3

if [[ "$ZUUL_BRANCH" == "REL1_31" ]]; then
    echo "New rules are too cool for this branch. SKIPPED"
    exit 0
fi

https://gerrit.wikimedia.org/g/integration/config/+/d1d911e5b5bf5dbe085bc00d4316ba0b325821af/jjb/mediawiki.yaml#836

- axis:
    name: ZUUL_BRANCH
    type: user-defined
    values: &mediawiki_supported_branches
        - master
        - REL1_35
        - REL1_31

https://gerrit.wikimedia.org/g/integration/config/+/d1d911e5b5bf5dbe085bc00d4316ba0b325821af/zuul/parameter_functions.py#683

# EventStreamConfig only requires MW >= REL1_35.
# Therefore remove it from REL1_31. T249514
if (
    params['ZUUL_BRANCH'] == 'REL1_31'
    and 'EventStreamConfig' in ext_deps
):
    ext_deps.remove('EventStreamConfig')
# WikibaseCirrusSearch doesn't exist in MW == REL1_31.
# Therefore remove it from REL1_31. T258715
if (
    params['ZUUL_BRANCH'] == 'REL1_31'
    and 'WikibaseCirrusSearch' in ext_deps
):
    ext_deps.remove('WikibaseCirrusSearch')
# Score in REL1_31 doesn't need Wikibase and stuff. Considering they're
# in somewhat of a mess, it's much easier to just remove them
if (
    params['ZUUL_PROJECT'] == 'mediawiki/extensions/Score'
    and params['ZUUL_BRANCH'] == 'REL1_31'
):
    ext_deps.remove('ArticlePlaceholder')
    ext_deps.remove('PropertySuggester')
    ext_deps.remove('Wikibase')
    ext_deps.remove('WikibaseQualityConstraints')
    ext_deps.remove('WikibaseMediaInfo')
    ext_deps.remove('WikimediaBadges')
    ext_deps.remove('WikibaseLexeme')

Also applied, though code review generally works better in gerrit. :-)

Reedy changed the status of subtask T279858: Formally EOL REL1_31 from Open to In Progress.Sep 29 2021, 2:55 PM
Reedy changed the task status from Open to In Progress.Sep 29 2021, 4:15 PM
Reedy triaged this task as Medium priority.

Change 683031 merged by jenkins-bot:

[integration/config@master] Zuul: Drop CI support for REL1_31 branch

https://gerrit.wikimedia.org/r/683031

Change 725118 had a related patch set uploaded (by Reedy; author: Reedy):

[integration/config@master] assert-no-mediawiki-errors.bash: Remove REL1_31 guard

https://gerrit.wikimedia.org/r/725118

^ After that one... There's just this one

- job:
    name: 'quibble-integration'
    project-type: matrix
    concurrent: false
    execution-strategy:
        sequential: true
    parameters:
        - matrix-combinations:
            name: combo
            description: 'Select matrix combinations'
    axes:
        - axis:
            type: label-expression
            name: label
            values:
                - contint2001
        - axis:
            name: ZUUL_BRANCH
            type: user-defined
            values: &mediawiki_supported_branches
                - master
                - REL1_35
                - REL1_31

But why isn't REL1_36 and REL1_37 in there too?

Change 725118 abandoned by Reedy:

[integration/config@master] assert-no-mediawiki-errors.bash: Remove REL1_31 guard

Reason:

bah

https://gerrit.wikimedia.org/r/725118

Reedy assigned this task to Jdforrester-WMF.