Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1132151 - use builds on S3 for nightlies #263

Merged
merged 1 commit into from Jul 30, 2015
Merged

Bug 1132151 - use builds on S3 for nightlies #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gui/mozregui/ui/inbound.ui
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@
<string>branch like [b2g-inbound|fx-team|...]</string>
</property>
<property name="placeholderText">
<string>you can choose an inbound branch name on ftp.mozilla.org.</string>
<string>you can choose an inbound branch name on archive.mozilla.org.</string>
</property>
</widget>
</item>
Expand Down
3 changes: 2 additions & 1 deletion mozregression/bisector.py
View file
Open in desktop
Expand Up @@ -247,7 +247,8 @@ def find_inbound_changesets(self, days_required=4):
# - old nightly builds do not have the changeset information
# so we can't go on inbound. Anyway, these are probably too
# old and won't even exists on inbound.
# - something else (builds were not updated on ftp, or all invalid)
# - something else (builds were not updated on archive.mozilla.org,
# or all invalid)
start_range = first_date - datetime.timedelta(days=days_required)
end_range = start_range - datetime.timedelta(days=max_attempts)
raise MozRegressionError(
Expand Down
6 changes: 4 additions & 2 deletions mozregression/fetch_configs.py
View file
Open in desktop
Expand Up @@ -77,8 +77,10 @@ def get_nighly_base_url(self, date):
"""
Returns the base part of the nightly build url for a given date.
"""
return ("http://ftp.mozilla.org/pub/mozilla.org/%s/nightly/%04d/%02d/"
% (self.nightly_base_repo_name, date.year, date.month))
return (
"https://archive.mozilla.org/pub/mozilla.org/%s/nightly/%04d/%02d/"
% (self.nightly_base_repo_name, date.year, date.month)
)

def set_nightly_repo(self, repo):
"""
Expand Down
2 changes: 1 addition & 1 deletion mozregression/main.py
View file
Open in desktop
Expand Up @@ -151,7 +151,7 @@ def parse_args(argv=None):
parser.add_argument("--inbound-branch",
metavar="[b2g-inbound|fx-team|...]",
default=defaults.get("inbound-branch"),
help="inbound branch name on ftp.mozilla.org.")
help="inbound branch name on archive.mozilla.org.")

parser.add_argument("--bits",
choices=("32", "64"),
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/test_build_data.py
View file
Open in desktop
Expand Up @@ -196,7 +196,7 @@ def test_get_url(self, url_links):
'bar/'
]
urls = self.url_builder.get_urls(datetime.date(2014, 11, 01))
self.assertEqual(urls[0], 'http://ftp.mozilla.org/pub/mozilla.org/\
self.assertEqual(urls[0], 'https://archive.mozilla.org/pub/mozilla.org/\
firefox/nightly/2014/11/2014-11-01-03-02-05-foo/')
urls = self.url_builder.get_urls(datetime.date(2014, 11, 02))
self.assertEqual(urls, [])
Expand All @@ -221,15 +221,15 @@ def setUp(self):
def test_get_valid_build_for_date(self, get_urls,
find_build_info, find_build_info_txt):
get_urls.return_value = [
'http://ftp.mozilla.org/pub/mozilla.org/\
'https://archive.mozilla.org/pub/mozilla.org/\
bar/nightly/2014/11/2014-11-15-08-02-05-mozilla-central/',
'http://ftp.mozilla.org/pub/mozilla.org/\
'https://archive.mozilla.org/pub/mozilla.org/\
bar/nightly/2014/11/2014-11-15-04-02-05-mozilla-central/',
'http://ftp.mozilla.org/pub/mozilla.org/\
'https://archive.mozilla.org/pub/mozilla.org/\
bar/nightly/2014/11/2014-11-15-03-02-05-mozilla-central',
'http://ftp.mozilla.org/pub/mozilla.org/\
'https://archive.mozilla.org/pub/mozilla.org/\
bar/nightly/2014/11/2014-11-15-02-02-05-mozilla-central/',
'http://ftp.mozilla.org/pub/mozilla.org/\
'https://archive.mozilla.org/pub/mozilla.org/\
bar/nightly/2014/11/2014-11-15-01-02-05-mozilla-central/',
]

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_fetch_configs.py
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ def test_build_info_regex(self):
def test_get_nighly_base_url(self):
base_url = self.conf.get_nighly_base_url(datetime.date(2008,
6, 27))
self.assertEqual(base_url, 'http://ftp.mozilla.org/pub/mozilla.org/\
self.assertEqual(base_url, 'https://archive.mozilla.org/pub/mozilla.org/\
firefox/nightly/2008/06/')

def test_nightly_repo_regex(self):
Expand Down