Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
bug 1123802: point release automation jobs directly at aus4. r=nthomas
Browse files Browse the repository at this point in the history
  • Loading branch information
@bhearsum
bhearsum committed Jan 21, 2015
1 parent 72c6a9c commit cdbdd1c
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion lib/python/mozilla_buildtools/test/sample-update-verify.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
release="4.0" product="Firefox" platform="Linux_x86-gcc3" build_id="888" locales="af de en-US ja zh-TW" channel="betatest" patch_types="partial complete" from="/firefox/4.0rc1.tar.bz2" aus_server="https://aus2.mozilla.org" ftp_server_from="stage.mozilla.org/firefox" ftp_server_to="stage.mozilla.org/firefox" to="/firefox/4.0rc2.tar.bz2" mar_channel_IDs="firefox-mozilla-beta"
release="4.0" product="Firefox" platform="Linux_x86-gcc3" build_id="888" locales="af de en-US ja zh-TW" channel="betatest" patch_types="partial complete" from="/firefox/4.0rc1.tar.bz2" aus_server="https://aus4.mozilla.org" ftp_server_from="stage.mozilla.org/firefox" ftp_server_to="stage.mozilla.org/firefox" to="/firefox/4.0rc2.tar.bz2" mar_channel_IDs="firefox-mozilla-beta"
release="4.0b12" product="Firefox" platform="Linux_x86-gcc3" build_id="777" locales="af en-US" channel="betatest" patch_types="complete" from="/firefox/4.0b12.tar.bz2" ftp_server_from="stage.mozilla.org/firefox" ftp_server_to="stage.mozilla.org/firefox"
release="4.0b12" product="Firefox" platform="Linux_x86-gcc3" build_id="777" locales="de ja zh-TW" channel="betatest" patch_types="complete" ftp_server_from="stage.mozilla.org/firefox" ftp_server_to="stage.mozilla.org/firefox"
release="3.7a1" product="Firefox" platform="Linux_x86-gcc3" build_id="666" locales="en-US" channel="betatest" patch_types="complete" ftp_server_from="stage.mozilla.org/firefox" ftp_server_to="stage.mozilla.org/firefox"
14 changes: 7 additions & 7 deletions lib/python/mozilla_buildtools/test/test_release_updates_verify.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def testRead(self):
uvc2.product = "Firefox"
uvc2.platform = "Linux_x86-gcc3"
uvc2.channel = "betatest"
uvc2.aus_server = "https://aus2.mozilla.org"
uvc2.aus_server = "https://aus4.mozilla.org"
uvc2.to = "/firefox/4.0rc2.tar.bz2"
uvc2.addRelease("4.0", build_id="888",
locales=["af", "de", "en-US", "ja", "zh-TW"],
Expand Down Expand Up @@ -103,7 +103,7 @@ def testWrite(self):
self.uvc.product = "Firefox"
self.uvc.platform = "Linux_x86-gcc3"
self.uvc.channel = "betatest"
self.uvc.aus_server = "https://aus2.mozilla.org"
self.uvc.aus_server = "https://aus4.mozilla.org"
self.uvc.to = "/firefox/4.0rc2.tar.bz2"
self.uvc.addRelease("4.0", build_id="888",
locales=("af", "de", "en-US", "ja", "zh-TW"),
Expand Down Expand Up @@ -150,7 +150,7 @@ def testGetChunk(self):
uvc2.product = "Firefox"
uvc2.platform = "Linux_x86-gcc3"
uvc2.channel = "betatest"
uvc2.aus_server = "https://aus2.mozilla.org"
uvc2.aus_server = "https://aus4.mozilla.org"
uvc2.to = "/firefox/4.0rc2.tar.bz2"
uvc2.addRelease("4.0", build_id="888",
locales=["af", "de", "en-US"],
Expand All @@ -172,7 +172,7 @@ def testGetChunkWithPathWithSpaces(self):
self.uvc.product = "Firefox"
self.uvc.platform = "Linux_x86-gcc3"
self.uvc.channel = "betatest"
self.uvc.aus_server = "https://aus2.mozilla.org"
self.uvc.aus_server = "https://aus4.mozilla.org"
self.uvc.ftp_server_from = "stage.mozilla.org/firefox"
self.uvc.ftp_server_to = "stage.mozilla.org/firefox"
self.uvc.to = "/firefox/Firefox 4.0 Beta 2.exe"
Expand All @@ -184,7 +184,7 @@ def testGetChunkWithPathWithSpaces(self):
uvc2.product = "Firefox"
uvc2.platform = "Linux_x86-gcc3"
uvc2.channel = "betatest"
uvc2.aus_server = "https://aus2.mozilla.org"
uvc2.aus_server = "https://aus4.mozilla.org"
uvc2.ftp_server_from = "stage.mozilla.org/firefox"
uvc2.ftp_server_to = "stage.mozilla.org/firefox"
uvc2.to = "/firefox/Firefox 4.0 Beta 2.exe"
Expand Down Expand Up @@ -226,7 +226,7 @@ def testGetFullReleaseTests(self):
uvc2.product = "Firefox"
uvc2.platform = "Linux_x86-gcc3"
uvc2.channel = "betatest"
uvc2.aus_server = "https://aus2.mozilla.org"
uvc2.aus_server = "https://aus4.mozilla.org"
uvc2.to = "/firefox/4.0rc2.tar.bz2"
uvc2.addRelease("4.0", build_id="888",
locales=["af", "de", "en-US", "ja", "zh-TW"],
Expand All @@ -251,7 +251,7 @@ def testGetQuickReleaseTests(self):
uvc2.product = "Firefox"
uvc2.platform = "Linux_x86-gcc3"
uvc2.channel = "betatest"
uvc2.aus_server = "https://aus2.mozilla.org"
uvc2.aus_server = "https://aus4.mozilla.org"
uvc2.to = "/firefox/4.0rc2.tar.bz2"
uvc2.addRelease("4.0b12", build_id="777",
locales=["de", "ja", "zh-TW"],
Expand Down
14 changes: 7 additions & 7 deletions release/final-verification.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,10 @@ export TMPDIR="$(mktemp -d -t final_verification.XXXXXXXXXX)"
# this temporary file will list all update urls that need to be checked, in this format:
# <update url> <comma separated list of patch types> <cfg file that requests it> <line number of config file>
# e.g.
# https://aus2.mozilla.org/update/3/Firefox/18.0/20130104154748/Linux_x86_64-gcc3/zh-TW/releasetest/default/default/default/update.xml?force=1 complete moz20-firefox-linux64-major.cfg 3
# https://aus2.mozilla.org/update/3/Firefox/18.0/20130104154748/Linux_x86_64-gcc3/zu/releasetest/default/default/default/update.xml?force=1 complete moz20-firefox-linux64.cfg 7
# https://aus2.mozilla.org/update/3/Firefox/19.0/20130215130331/Linux_x86_64-gcc3/ach/releasetest/default/default/default/update.xml?force=1 complete,partial moz20-firefox-linux64-major.cfg 11
# https://aus2.mozilla.org/update/3/Firefox/19.0/20130215130331/Linux_x86_64-gcc3/af/releasetest/default/default/default/update.xml?force=1 complete,partial moz20-firefox-linux64.cfg 17
# https://aus4.mozilla.org/update/3/Firefox/18.0/20130104154748/Linux_x86_64-gcc3/zh-TW/releasetest/default/default/default/update.xml?force=1 complete moz20-firefox-linux64-major.cfg 3
# https://aus4.mozilla.org/update/3/Firefox/18.0/20130104154748/Linux_x86_64-gcc3/zu/releasetest/default/default/default/update.xml?force=1 complete moz20-firefox-linux64.cfg 7
# https://aus4.mozilla.org/update/3/Firefox/19.0/20130215130331/Linux_x86_64-gcc3/ach/releasetest/default/default/default/update.xml?force=1 complete,partial moz20-firefox-linux64-major.cfg 11
# https://aus4.mozilla.org/update/3/Firefox/19.0/20130215130331/Linux_x86_64-gcc3/af/releasetest/default/default/default/update.xml?force=1 complete,partial moz20-firefox-linux64.cfg 17
update_xml_urls="$(mktemp -t update_xml_urls.XXXXXXXXXX)"

####################################################################################
Expand All @@ -211,7 +211,7 @@ update_xml_urls="$(mktemp -t update_xml_urls.XXXXXXXXXX)"
# output of the error code, and the instance data for the failure.
# e.g.
#
# PATCH_TYPE_MISSING https://aus2.mozilla.org/update/3/Firefox/4.0b12/20110222205441/Linux_x86-gcc3/dummy-locale/releasetest/update.xml?force=1 complete https://aus3.mozilla.org/update/3/Firefox/4.0b12/20110222205441/Linux_x86-gcc3/dummy-locale/releasetest/default/default/default/update.xml?force=1
# PATCH_TYPE_MISSING https://aus4.mozilla.org/update/3/Firefox/4.0b12/20110222205441/Linux_x86-gcc3/dummy-locale/releasetest/update.xml?force=1 complete https://aus4.mozilla.org/update/3/Firefox/4.0b12/20110222205441/Linux_x86-gcc3/dummy-locale/releasetest/default/default/default/update.xml?force=1
#
# 2) mktemp -t update_xml_to_mar.XXXXXXXXXX
#
Expand Down Expand Up @@ -247,11 +247,11 @@ update_xml_urls="$(mktemp -t update_xml_urls.XXXXXXXXXX)"

# generate full list of update.xml urls, followed by patch types,
# as defined in the specified config files - and write into "${update_xml_urls}" file
aus_server="https://aus2.mozilla.org"
aus_server="https://aus4.mozilla.org"
for cfg_file in "${@}"
do
line_no=0
sed -e 's/localtest/cdntest/;s/betatest/releasetest/;s/esrtest/releasetest/' "${cfg_file}" | while read config_line
sed -e 's/localtest/cdntest/' "${cfg_file}" | while read config_line
do
let line_no++
# to avoid contamination between iterations, reset variables
Expand Down
12 changes: 6 additions & 6 deletions release/update-verify-bump.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ sub ProcessArgs {
is different than --version.
--build-number/-n The current build number of the product.
--aus-server-url/-a The URL to be used when constructing update URLs.
Eg. https://aus2.mozilla.org
Eg. https://aus4.mozilla.org
--staging-server/-s The staging server that builds should be pulled from.
--verify-config/-c The path and filename of the config file to be bumped.
--old-candidates-dir/-d The path (on the staging server) to the candidates
Expand Down Expand Up @@ -430,7 +430,7 @@ sub RunUnitTests {
oldOldBuildid => '2008070206',
oldOldFromBuild => '/firefox/releases/3.0.1/linux-i686/%locale%/firefox-3.0.1.tar.bz2',
oldOldToBuild => '/firefox/nightly/3.0.2-candidates/build6/firefox-3.0.2.%locale%.linux-i686.tar.bz2',
ausServer => 'https://aus2.mozilla.org',
ausServer => 'https://aus4.mozilla.org',
stagingServer => 'build.mozilla.org',
oldCandidatesDir => '/update-bump-unit-tests/pub/mozilla.org/firefox/nightly/3.0.2-candidates/build6',
prettyCandidatesDir => '0',
Expand Down Expand Up @@ -458,7 +458,7 @@ sub RunUnitTests {
oldOldBuildid => '20080829082037',
oldOldFromBuild => '/firefox/releases/shiretoko/alpha2/win32/en-US/Shiretoko Alpha 2 Setup.exe',
oldOldToBuild => '/firefox/nightly/3.1b1-candidates/build2/win32/%locale%/Firefox 3.1 Beta 1 Setup.exe',
ausServer => 'https://aus2.mozilla.org',
ausServer => 'https://aus4.mozilla.org',
stagingServer => 'build.mozilla.org',
oldCandidatesDir => '/update-bump-unit-tests/pub/mozilla.org/firefox/nightly/3.1b1-candidates/build2',
prettyCandidatesDir => '1',
Expand All @@ -485,7 +485,7 @@ sub RunUnitTests {
oldOldBuildid => '20091221164558',
oldOldFromBuild => '/firefox/nightly/3.5.7-candidates/build1/win32/%locale%/Firefox Setup 3.5.7.exe',
oldOldToBuild => '/firefox/nightly/3.6a1-candidates/build1/win32/%locale%/MozillaDeveloperPreview Setup 3.6 Aplha 1.exe',
ausServer => 'https://aus2.mozilla.org',
ausServer => 'https://aus4.mozilla.org',
stagingServer => 'build.mozilla.org',
oldCandidatesDir => '/update-bump-unit-tests/pub/mozilla.org/firefox/nightly/3.6a1-candidates/build1',
prettyCandidatesDir => '1',
Expand Down Expand Up @@ -513,7 +513,7 @@ sub RunUnitTests {
oldOldBuildid => '',
oldOldFromBuild => '',
oldOldToBuild => '',
ausServer => 'https://aus2.mozilla.org',
ausServer => 'https://aus4.mozilla.org',
stagingServer => 'build.mozilla.org',
oldCandidatesDir => '/update-bump-unit-tests/pub/mozilla.org/firefox/nightly/3.5.5-candidates/build1',
prettyCandidatesDir => '1',
Expand All @@ -540,7 +540,7 @@ sub RunUnitTests {
oldOldBuildid => '',
oldOldFromBuild => '',
oldOldToBuild => '',
ausServer => 'https://aus2.mozilla.org',
ausServer => 'https://aus4.mozilla.org',
stagingServer => 'build.mozilla.org',
oldCandidatesDir => '/update-bump-unit-tests/pub/mozilla.org/firefox/nightly/3.5.5-candidates/build1',
prettyCandidatesDir => '1',
Expand Down
2 changes: 1 addition & 1 deletion release/updates/verify.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ create_cache

ftp_server_to="http://stage.mozilla.org/pub/mozilla.org"
ftp_server_from="http://stage.mozilla.org/pub/mozilla.org"
aus_server="https://aus2.mozilla.org"
aus_server="https://aus4.mozilla.org"
to=""

pushd `dirname $0` &>/dev/null
Expand Down

0 comments on commit cdbdd1c

Please sign in to comment.