Skip to content

Commit 22514a5

Browse files
authored
Merge pull request #225 from mozilla-services/limitJenkinsVersioning
Restrict the Jenkins environment to only do versioning for ESR 115.
2 parents d2cedc9 + 84723b4 commit 22514a5

2 files changed

Lines changed: 19 additions & 0 deletions

File tree

constants.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@
107107

108108
VERS_LARGE_ENTITIES_SEPARATION_STARTED = 74
109109

110+
# In the Jenkins environment we only generate and publish lists for the ESR
111+
# baseline (Firefox 115). Every other version is handled elsewhere (GKE /
112+
# Remote Settings), so the Jenkins job only needs to populate this one version.
113+
# This is intentionally hardcoded: the ESR baseline served by Jenkins is fixed
114+
# and will not change.
115+
JENKINS_ESR_VERSION = 115
116+
110117
WEBKIT_LISTS_DIR = 'webkit-lists'
111118
WEBKIT_BLOCK_ALL = "block"
112119
WEBKIT_BLOCK_COOKIES = "block-cookies"

lists2safebrowsing.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from constants import (
1616
DNT_SECTIONS,
17+
JENKINS_ESR_VERSION,
1718
PLUGIN_SECTIONS,
1819
PRE_DNT_SECTIONS,
1920
LARGE_ENTITIES_SECTIONS,
@@ -37,6 +38,7 @@
3738

3839
from settings import (
3940
config,
41+
execution_environment,
4042
shared_state
4143
)
4244

@@ -470,6 +472,16 @@ def start_versioning(config, chunknum, shavar_prod_lists_branches):
470472
ver = p_version.parse(branch_name)
471473

472474
if isinstance(ver, p_version.Version):
475+
# In the Jenkins environment we only populate the ESR baseline, so
476+
# skip every other version branch. This keeps the run short enough
477+
# to avoid the Jenkins build timeout (which manifests as exit 143).
478+
if (execution_environment == "JENKINS"
479+
and ver.release[0] != JENKINS_ESR_VERSION):
480+
print('\n\n*** Skipping {ver}: Jenkins only populates ESR {esr} ***'.format(
481+
ver=branch_name, esr=JENKINS_ESR_VERSION)
482+
)
483+
continue
484+
473485
print('\n\n*** Start Versioning for {ver} ***'.format(
474486
ver=branch_name)
475487
)

0 commit comments

Comments
 (0)