From 87bbb075198dd780fa46416a3dcb45eb7de0d0d2 Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Mon, 29 Aug 2011 13:28:05 -0700 Subject: [PATCH] bug 682939 - mozharness 6.0.1 bumps. r=lsblakk --- configs/deb_repos/release_mozilla-release.py | 7 ++----- .../release_mozilla-release_linux-android.json | 10 +++++----- .../release_mozilla-release_linux-maemo5-gtk.json | 10 +++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/configs/deb_repos/release_mozilla-release.py b/configs/deb_repos/release_mozilla-release.py index 2eaa6c8f..fc08e551 100644 --- a/configs/deb_repos/release_mozilla-release.py +++ b/configs/deb_repos/release_mozilla-release.py @@ -1,14 +1,11 @@ -VERSION = "6.0" +VERSION = "6.0.1" BUILDNUM = 1 config = { "log_name": "signdebs", "locales_file": "buildbot-configs/mozilla/l10n-changesets_mobile-release.json", "locales": ['en-US', 'multi'], - "hg_repos": [{ - "repo": "http://hg.mozilla.org/build/buildbot-configs", - "tag": "FENNEC_6_0_RELEASE" - }], + "hg_repos": [], "package_name": "fennec", "repo_name": "%(locale)s", "remote_repo_path": "/home/ftp/pub/mozilla.org/mobile/candidates/%s-candidates/repos" % VERSION, diff --git a/configs/multi_locale/release_mozilla-release_linux-android.json b/configs/multi_locale/release_mozilla-release_linux-android.json index 30066dd1..fa8fae66 100644 --- a/configs/multi_locale/release_mozilla-release_linux-android.json +++ b/configs/multi_locale/release_mozilla-release_linux-android.json @@ -8,22 +8,22 @@ "ignore_locales": ["en-US", "multi"], "repos": [{ "repo": "http://hg.mozilla.org/releases/mozilla-release", - "tag": "FENNEC_6_0_RELEASE", + "tag": "FENNEC_6_0_1_RELEASE", "dest": "build" },{ "repo": "http://hg.mozilla.org/build/buildbot-configs", - "tag": "FENNEC_6_0_RELEASE", + "tag": "FENNEC_6_0_1_RELEASE", "dest": "build/configs" },{ "repo": "http://hg.mozilla.org/build/tools", - "tag": "FENNEC_6_0_RELEASE", + "tag": "FENNEC_6_0_1_RELEASE", "dest": "tools" },{ "repo": "http://hg.mozilla.org/build/compare-locales", - "tag": "FENNEC_6_0_RELEASE" + "tag": "FENNEC_6_0_1_RELEASE" }], "hg_l10n_base": "http://hg.mozilla.org/releases/l10n/mozilla-release", - "hg_l10n_tag": "FENNEC_6_0_RELEASE", + "hg_l10n_tag": "FENNEC_6_0_1_RELEASE", "l10n_dir": "mozilla-release", "env": { "JAVA_HOME": "/tools/jdk", diff --git a/configs/multi_locale/release_mozilla-release_linux-maemo5-gtk.json b/configs/multi_locale/release_mozilla-release_linux-maemo5-gtk.json index fc81d985..5508dcd0 100644 --- a/configs/multi_locale/release_mozilla-release_linux-maemo5-gtk.json +++ b/configs/multi_locale/release_mozilla-release_linux-maemo5-gtk.json @@ -10,22 +10,22 @@ "ignore_locales": ["en-US", "multi"], "repos": [{ "repo": "http://hg.mozilla.org/releases/mozilla-release", - "tag": "FENNEC_6_0_RELEASE", + "tag": "FENNEC_6_0_1_RELEASE", "dest": "build" },{ "repo": "http://hg.mozilla.org/build/buildbot-configs", - "tag": "FENNEC_6_0_RELEASE", + "tag": "FENNEC_6_0_1_RELEASE", "dest": "build/configs" },{ "repo": "http://hg.mozilla.org/build/tools", - "tag": "FENNEC_6_0_RELEASE", + "tag": "FENNEC_6_0_1_RELEASE", "dest": "tools" },{ "repo": "http://hg.mozilla.org/build/compare-locales", - "tag": "FENNEC_6_0_RELEASE" + "tag": "FENNEC_6_0_1_RELEASE" }], "hg_l10n_base": "http://hg.mozilla.org/releases/l10n/mozilla-release", - "hg_l10n_tag": "FENNEC_6_0_RELEASE", + "hg_l10n_tag": "FENNEC_6_0_1_RELEASE", "l10n_dir": "mozilla-release", "merge_locales": true, "mozilla_dir": "build",