зеркало из https://github.com/mozilla/bedrock.git
Remove app name suffix from deployment
Was only needed for the "-deis" suffix on stage and prod but those are going away.
This commit is contained in:
Родитель
24f6c3d0d6
Коммит
d966001f65
|
@ -126,7 +126,6 @@ The available branch configuration options are as follows:
|
|||
* ``smoke_tests``: boolean. Set to ``true`` to cause the unit and smoke test suites run against the docker images.
|
||||
* ``push_public_registry``: boolean. Set to ``true`` to cause the built images to be pushed to the public docker hub.
|
||||
* ``require_tag``: boolean. Set to ``true`` to require that the commit being built have a git tag in the format YYYY-MM-DD.X.
|
||||
* ``app_name_suffix``: string. Set to a value to have the IRC notification alter the URL of the deployed app. (only useful for stage and prod)
|
||||
* ``regions``: list. A list of strings indicating the deployment regions for the set of apps. The valid values are in the ``regions`` area of
|
||||
the ``jenkins/global.yml`` file. If omitted a deployment to only ``usw`` is assumed.
|
||||
* ``apps``: list. A list of strings indicating the deis app name(s) to which to deploy. If omitted no deployments will occur.
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
push_public_registry: true
|
||||
smoke_tests: true
|
||||
require_tag: true
|
||||
app_name_suffix: "-deis"
|
||||
regions:
|
||||
- usw
|
||||
- euw
|
||||
|
|
|
@ -92,11 +92,10 @@ if ( config.apps ) {
|
|||
}
|
||||
}
|
||||
for (appname in config.apps) {
|
||||
appSuffix = config.app_name_suffix ?: ''
|
||||
if ( config.demo ) {
|
||||
appURL = utils.demoAppURL(appname, region)
|
||||
} else {
|
||||
appURL = "https://${appname}${appSuffix}.${region.name}.moz.works"
|
||||
appURL = "https://${appname}.${region.name}.moz.works"
|
||||
}
|
||||
stageName = "Deploy ${appname}-${region.name}"
|
||||
// ensure no deploy/test cycle happens in parallel for an app/region
|
||||
|
|
Загрузка…
Ссылка в новой задаче