Skip to content

feat(beetmover): add linuxfirefoxcom and linuxfirefoxcom-stage GCS resources #1512

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

Draft
JohanLorenzo wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(beetmover): add linuxfirefoxcom and linuxfirefoxcom-stage GCS resources #1512

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions beetmoverscript/docker.d/init_worker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ case $COT_PRODUCT in
test_var_set 'MAVEN_KEY'
test_var_set 'MAVEN_NIGHTLY_ID'
test_var_set 'MAVEN_NIGHTLY_KEY'
test_var_set 'GCS_LINUXFIREFOXCOM_STAGE_CREDS'
;;
prod)
test_var_set 'GCS_RELEASE_CREDS'
Expand All @@ -37,6 +38,7 @@ case $COT_PRODUCT in
test_var_set 'MAVEN_KEY'
test_var_set 'MAVEN_NIGHTLY_ID'
test_var_set 'MAVEN_NIGHTLY_KEY'
test_var_set 'GCS_LINUXFIREFOXCOM_CREDS'
;;
*)
exit 1
Expand Down
17 changes: 17 additions & 0 deletions beetmoverscript/docker.d/worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@ url_prefix:
$match:
'COT_PRODUCT == "firefox" && (ENV == "dev" || ENV == "fake-prod")':
dep: 'https://ftp.stage.mozaws.net'
linuxfirefoxcom-stage: 'https://linuxfirefoxcom-stage.data-static-websites.nonprod.webservices.mozgcp.net'
'COT_PRODUCT == "firefox" && ENV == "prod"':
nightly: 'https://archive.mozilla.org'
release: 'https://archive.mozilla.org'
dep: 'https://ftp.stage.mozaws.net'
linuxfirefoxcom-stage: 'https://linuxfirefoxcom-stage.data-static-websites.nonprod.webservices.mozgcp.net'
linuxfirefoxcom: 'https://linux.firefox.com'
'COT_PRODUCT == "xpi" && (ENV == "dev" || ENV == "fake-prod")':
dep: 'https://ftp.stage.mozaws.net'
'COT_PRODUCT == "xpi" && ENV == "prod"':
Expand Down Expand Up @@ -83,6 +86,13 @@ clouds:
name: 'mozilla-rpm'
location: 'us'
project: 'moz-fx-productdelivery-no-7d6a'
# curl https://linux.firefox.com | sh
linuxfirefoxcom-stage:
credentials: { "$eval": "GCS_LINUXFIREFOXCOM_STAGE_CREDS" }
fail_task_on_error: True
enabled: True
product_buckets:
firefox: 'moz-fx-data-static-websit-f7e0-linuxfirefoxcom'
'COT_PRODUCT == "firefox" && ENV == "prod"':
nightly:
credentials: { "$eval": "GCS_RELEASE_CREDS" }
Expand Down Expand Up @@ -146,6 +156,13 @@ clouds:
product_buckets:
firefox: 'moz-fx-productdelivery-pr-38b5-productdelivery'
fenix: 'moz-fx-productdelivery-pr-38b5-productdelivery'
# curl https://linux.firefox.com | sh
linuxfirefoxcom:
credentials: { "$eval": "GCS_LINUXFIREFOXCOM_CREDS" }
fail_task_on_error: True
enabled: True
product_buckets:
firefox: 'moz-fx-data-static-websit-8565-linuxfirefoxcom'
'COT_PRODUCT == "xpi" && (ENV == "dev" || ENV == "fake-prod")':
dep:
credentials: { "$eval": "GCS_DEP_CREDS" }
Expand Down
1 change: 1 addition & 0 deletions beetmoverscript/src/beetmoverscript/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
".pkg": "application/x-newton-compatible-pkg",
".pom": "application/xml",
".rcc": "application/octet-stream",
".sh": "text/plain",
".sha1": "text/plain",
".sha256": "text/plain",
".sha512": "text/plain",
Expand Down
2 changes: 2 additions & 0 deletions beetmoverscript/tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def test_firefox_fake_prod():
"GCS_DEP_CREDS": "",
"GCS_RELEASE_CREDS": "",
"GCS_INTEGRATION_CREDS": "",
"GCS_LINUXFIREFOXCOM_STAGE_CREDS": "",
"DEP_ID": "",
"DEP_KEY": "",
"DEP_PARTNER_ID": "",
Expand All @@ -56,6 +57,7 @@ def test_firefox_prod():
"GCS_DEP_CREDS": "",
"GCS_RELEASE_CREDS": "",
"GCS_INTEGRATION_CREDS": "",
"GCS_LINUXFIREFOXCOM_CREDS": "",
"NIGHTLY_ID": "",
"NIGHTLY_KEY": "",
"RELEASE_ID": "",
Expand Down
2 changes: 2 additions & 0 deletions tests/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"GCS_DEP_CREDS": "1",
"GCS_RELEASE_CREDS": "1",
"GCS_INTEGRATION_CREDS": "1",
"GCS_LINUXFIREFOXCOM_STAGE_CREDS": "1",
"GCS_LINUXFIREFOXCOM_CREDS": "1",
"MAVEN_ID": "1",
"MAVEN_KEY": "1",
"MAVEN_NIGHTLY_ID": "1",
Expand Down