diff --git a/beetmoverscript/docker.d/init_worker.sh b/beetmoverscript/docker.d/init_worker.sh index 18360e997..c54d6177d 100755 --- a/beetmoverscript/docker.d/init_worker.sh +++ b/beetmoverscript/docker.d/init_worker.sh @@ -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' @@ -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 diff --git a/beetmoverscript/docker.d/worker.yml b/beetmoverscript/docker.d/worker.yml index fd6f0e108..7ef3d0747 100644 --- a/beetmoverscript/docker.d/worker.yml +++ b/beetmoverscript/docker.d/worker.yml @@ -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"': @@ -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" } @@ -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" } diff --git a/beetmoverscript/src/beetmoverscript/constants.py b/beetmoverscript/src/beetmoverscript/constants.py index e7def06b9..8ef88ea2d 100644 --- a/beetmoverscript/src/beetmoverscript/constants.py +++ b/beetmoverscript/src/beetmoverscript/constants.py @@ -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", diff --git a/beetmoverscript/tests/test_config.py b/beetmoverscript/tests/test_config.py index 7912384c5..dc595464d 100644 --- a/beetmoverscript/tests/test_config.py +++ b/beetmoverscript/tests/test_config.py @@ -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": "", @@ -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": "", diff --git a/tests/test_init.py b/tests/test_init.py index 3e85c236d..9ae38cfa9 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -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",