Skip to content
Browse files

bug 745234 - use auspush for pushing snippets. r=nthomas

  • Loading branch information...
1 parent 85c2964 commit 8a40d7fe7156aa1885666c82def8893ac2ceebfb @escapewindow escapewindow committed Apr 17, 2012
View
12 configs/signing/android_mozilla-beta.py
@@ -13,10 +13,10 @@
DOWNLOAD_BASE_URL = "http://ftp.mozilla.org/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d"
APK_BASE_NAME = "fennec-%(version)s.%(locale)s.android-arm.apk"
BUILDID_BASE_URL = DOWNLOAD_BASE_URL + "/%(platform)s_info.txt"
-FFXBLD_SSH_KEY = '~/.ssh/ffxbld_dsa'
-#FFXBLD_SSH_KEY = '~/staging_ssh/ffxbld_dsa'
-CLTBLD_SSH_KEY = '~/.ssh/cltbld_dsa'
-#CLTBLD_SSH_KEY = '~/staging_ssh/id_rsa'
+STAGE_SSH_KEY = '~/.ssh/ffxbld_dsa'
+#STAGE_SSH_KEY = '~/staging_ssh/ffxbld_dsa'
+AUS_SSH_KEY = '~/.ssh/auspush'
+#AUS_SSH_KEY = '~/staging_ssh/id_rsa'
RELEASE_UPDATE_URL = "http://download.mozilla.org/?product=fennec-%(version)s-complete&os=%(platform)s&lang=%(locale)s"
BETATEST_UPDATE_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d/%(apk_name)s"
@@ -70,10 +70,10 @@
"ftp_upload_base_dir": FTP_UPLOAD_BASE_DIR,
# These should be from release_config, but that has stage-ffxbld
# which doesn't work with dev-stage01.
- "ftp_ssh_key": FFXBLD_SSH_KEY,
+ "ftp_ssh_key": STAGE_SSH_KEY,
"ftp_user": "ffxbld",
- "aus_ssh_key": CLTBLD_SSH_KEY,
+ "aus_ssh_key": AUS_SSH_KEY,
"aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
"apk_base_name": APK_BASE_NAME,
View
12 configs/signing/android_mozilla-esr10.py
@@ -13,10 +13,10 @@
DOWNLOAD_BASE_URL = "http://ftp.mozilla.org/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d"
APK_BASE_NAME = "fennec-%(version)s.%(locale)s.android-arm.apk"
BUILDID_BASE_URL = DOWNLOAD_BASE_URL + "/%(platform)s_info.txt"
-FFXBLD_SSH_KEY = '~/.ssh/ffxbld_dsa'
-#FFXBLD_SSH_KEY = '~/staging_ssh/ffxbld_dsa'
-CLTBLD_SSH_KEY = '~/.ssh/cltbld_dsa'
-#CLTBLD_SSH_KEY = '~/staging_ssh/id_rsa'
+STAGE_SSH_KEY = '~/.ssh/ffxbld_dsa'
+#STAGE_SSH_KEY = '~/staging_ssh/ffxbld_dsa'
+AUS_SSH_KEY = '~/.ssh/auspush'
+#AUS_SSH_KEY = '~/staging_ssh/id_rsa'
RELEASE_UPDATE_URL = "http://download.mozilla.org/?product=fennec-%(version)s-complete&os=%(platform)s&lang=%(locale)s"
BETATEST_UPDATE_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d/%(apk_name)s"
@@ -70,10 +70,10 @@
"ftp_upload_base_dir": FTP_UPLOAD_BASE_DIR,
# These should be from release_config, but that has stage-ffxbld
# which doesn't work with dev-stage01.
- "ftp_ssh_key": FFXBLD_SSH_KEY,
+ "ftp_ssh_key": STAGE_SSH_KEY,
"ftp_user": "ffxbld",
- "aus_ssh_key": CLTBLD_SSH_KEY,
+ "aus_ssh_key": AUS_SSH_KEY,
"aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
"apk_base_name": APK_BASE_NAME,
View
12 configs/signing/android_mozilla-release.py
@@ -13,10 +13,10 @@
DOWNLOAD_BASE_URL = "http://ftp.mozilla.org/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d"
APK_BASE_NAME = "fennec-%(version)s.%(locale)s.android-arm.apk"
BUILDID_BASE_URL = DOWNLOAD_BASE_URL + "/%(platform)s_info.txt"
-FFXBLD_SSH_KEY = '~/.ssh/ffxbld_dsa'
-#FFXBLD_SSH_KEY = '~/staging_ssh/ffxbld_dsa'
-CLTBLD_SSH_KEY = '~/.ssh/cltbld_dsa'
-#CLTBLD_SSH_KEY = '~/staging_ssh/id_rsa'
+STAGE_SSH_KEY = '~/.ssh/ffxbld_dsa'
+#STAGE_SSH_KEY = '~/staging_ssh/ffxbld_dsa'
+AUS_SSH_KEY = '~/.ssh/auspush'
+#AUS_SSH_KEY = '~/staging_ssh/id_rsa'
RELEASE_UPDATE_URL = "http://download.mozilla.org/?product=fennec-%(version)s-complete&os=%(platform)s&lang=%(locale)s"
BETATEST_UPDATE_URL = "http://stage.mozilla.org/pub/mozilla.org/mobile/candidates/%(version)s-candidates/build%(buildnum)d/%(apk_name)s"
@@ -73,10 +73,10 @@
"ftp_upload_base_dir": FTP_UPLOAD_BASE_DIR,
# These should be from release_config, but that has stage-ffxbld
# which doesn't work with dev-stage01.
- "ftp_ssh_key": FFXBLD_SSH_KEY,
+ "ftp_ssh_key": STAGE_SSH_KEY,
"ftp_user": "ffxbld",
- "aus_ssh_key": CLTBLD_SSH_KEY,
+ "aus_ssh_key": AUS_SSH_KEY,
"aus_upload_base_dir": AUS_UPLOAD_BASE_DIR,
"apk_base_name": APK_BASE_NAME,
View
2 configs/single_locale/mozilla-aurora_android.py
@@ -12,7 +12,7 @@
#AUS_SERVER = "dev-stage01.build.sjc1.mozilla.com"
AUS_SERVER = "aus3-staging.mozilla.org"
AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_dsa"
+AUS_SSH_KEY = "~/.ssh/auspush"
AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"
View
2 configs/single_locale/mozilla-central_android.py
@@ -12,7 +12,7 @@
#AUS_SERVER = "dev-stage01.build.sjc1.mozilla.com"
AUS_SERVER = "aus3-staging.mozilla.org"
AUS_USER = "ffxbld"
-AUS_SSH_KEY = "~/.ssh/ffxbld_dsa"
+AUS_SSH_KEY = "~/.ssh/auspush"
AUS_UPLOAD_BASE_DIR = "/opt/aus2/incoming/2/Fennec"
AUS_BASE_DIR = BRANCH + "/%(build_target)s/%(buildid)s/%(locale)s"
HG_SHARE_BASE_DIR = "/builds/hg-shared"

0 comments on commit 8a40d7f

Please sign in to comment.
Something went wrong with that request. Please try again.