Removes legacy nightly automation
parent
b6d9bbda78
commit
a497d2bcd0
|
@ -78,7 +78,6 @@ which app id and settings to use. Here is a description of what each means:
|
||||||
|
|
||||||
- **debug** uses debug symbols and debug signing, adds tools like LeakCanary for troubleshooting, and does not strip unused or wasteful code
|
- **debug** uses debug symbols and debug signing, adds tools like LeakCanary for troubleshooting, and does not strip unused or wasteful code
|
||||||
- **fenixNightly** is a release build with nightly signing which uses the org.mozilla.fenix.nightly app id for nightly releases to Google Play
|
- **fenixNightly** is a release build with nightly signing which uses the org.mozilla.fenix.nightly app id for nightly releases to Google Play
|
||||||
- **fenixNightlyLegacy** is a release build with release signing which uses the org.mozilla.fenix production app id along with nightly logos, which we're trying to phase out
|
|
||||||
- **fenixBeta** is a release build with beta signing which uses the org.mozilla.fenix.beta app id for beta releases to Google Play
|
- **fenixBeta** is a release build with beta signing which uses the org.mozilla.fenix.beta app id for beta releases to Google Play
|
||||||
- **fenixProduction** is a release build with release signing which uses the org.mozilla.fenix app id for production releases to Google Play
|
- **fenixProduction** is a release build with release signing which uses the org.mozilla.fenix app id for production releases to Google Play
|
||||||
- **fennecProduction** is an experimental build with release signing which uses the org.mozilla.firefox app id and supports upgrading the older Firefox. **WARNING** Pre-production versions of this may result in data loss.
|
- **fennecProduction** is an experimental build with release signing which uses the org.mozilla.firefox app id and supports upgrading the older Firefox. **WARNING** Pre-production versions of this may result in data loss.
|
||||||
|
|
|
@ -53,10 +53,6 @@ android {
|
||||||
applicationIdSuffix ".fenix.performancetest"
|
applicationIdSuffix ".fenix.performancetest"
|
||||||
debuggable true
|
debuggable true
|
||||||
}
|
}
|
||||||
fenixNightlyLegacy releaseTemplate >> {
|
|
||||||
applicationIdSuffix ".fenix"
|
|
||||||
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
|
|
||||||
}
|
|
||||||
fenixNightly releaseTemplate >> {
|
fenixNightly releaseTemplate >> {
|
||||||
applicationIdSuffix ".fenix.nightly"
|
applicationIdSuffix ".fenix.nightly"
|
||||||
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
|
buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
|
||||||
|
@ -96,7 +92,6 @@ android {
|
||||||
// |--------------------|---------------|-----------|
|
// |--------------------|---------------|-----------|
|
||||||
// | debug | ✅ | ✅ | Both variants for testing and development.
|
// | debug | ✅ | ✅ | Both variants for testing and development.
|
||||||
// | forPerformanceTest | ✅ | ✅ | Both variants unless the perf team only cares about Nightly (TBD).
|
// | forPerformanceTest | ✅ | ✅ | Both variants unless the perf team only cares about Nightly (TBD).
|
||||||
// | fenixNightlyLegacy | ✅ | ✅ | Release type will be decommissioned soon.
|
|
||||||
// | fenixNightly | ✅ | ✅ | Built with both, but only the "geckoNightly" one is published to Google Play
|
// | fenixNightly | ✅ | ✅ | Built with both, but only the "geckoNightly" one is published to Google Play
|
||||||
// | fenixBeta | ❌ | ✅ | Fenix Beta ships with GV Beta
|
// | fenixBeta | ❌ | ✅ | Fenix Beta ships with GV Beta
|
||||||
// | fenixProduction | ❌ | ✅ | Fenix Production ships with GV Beta
|
// | fenixProduction | ❌ | ✅ | Fenix Production ships with GV Beta
|
||||||
|
|
|
@ -19,7 +19,6 @@ object Config {
|
||||||
"production" -> ReleaseChannel.Production
|
"production" -> ReleaseChannel.Production
|
||||||
"beta" -> ReleaseChannel.Beta
|
"beta" -> ReleaseChannel.Beta
|
||||||
"nightly" -> ReleaseChannel.Nightly
|
"nightly" -> ReleaseChannel.Nightly
|
||||||
"nightlyLegacy" -> ReleaseChannel.Nightly
|
|
||||||
"debug" -> ReleaseChannel.Debug
|
"debug" -> ReleaseChannel.Debug
|
||||||
else -> ReleaseChannel.Production // Performance-test builds should test production behaviour
|
else -> ReleaseChannel.Production // Performance-test builds should test production behaviour
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,9 +11,9 @@ object FeatureFlags {
|
||||||
private val production by lazy { BuildConfig.BUILD_TYPE == "fenixProduction" }
|
private val production by lazy { BuildConfig.BUILD_TYPE == "fenixProduction" }
|
||||||
// A convenience flag for beta builds.
|
// A convenience flag for beta builds.
|
||||||
private val beta by lazy { BuildConfig.BUILD_TYPE == "fenixBeta" }
|
private val beta by lazy { BuildConfig.BUILD_TYPE == "fenixBeta" }
|
||||||
// A convenience flag for the nightly build and (legacy) nightly channel in Google Play.
|
// A convenience flag for the nightly build in Google Play.
|
||||||
private val nightly by lazy {
|
private val nightly by lazy {
|
||||||
BuildConfig.BUILD_TYPE == "fenixNightly" || BuildConfig.BUILD_TYPE == "fenixNightlyLegacy"
|
BuildConfig.BUILD_TYPE == "fenixNightly"
|
||||||
}
|
}
|
||||||
// A convenience flag for debug builds.
|
// A convenience flag for debug builds.
|
||||||
private val debug by lazy { BuildConfig.BUILD_TYPE == "debug" }
|
private val debug by lazy { BuildConfig.BUILD_TYPE == "debug" }
|
||||||
|
|
|
@ -63,17 +63,6 @@ jobs:
|
||||||
treeherder:
|
treeherder:
|
||||||
symbol: nightly(B)
|
symbol: nightly(B)
|
||||||
|
|
||||||
nightly-legacy:
|
|
||||||
attributes:
|
|
||||||
nightly: true
|
|
||||||
include-nightly-version: true
|
|
||||||
include-shippable-secrets: true
|
|
||||||
run:
|
|
||||||
geckoview-engine: geckoNightly
|
|
||||||
gradle-build-type: fenixNightlyLegacy
|
|
||||||
treeherder:
|
|
||||||
symbol: nightlyLegacy(B)
|
|
||||||
|
|
||||||
fennec-production:
|
fennec-production:
|
||||||
attributes:
|
attributes:
|
||||||
nightly: true
|
nightly: true
|
||||||
|
|
|
@ -8,7 +8,6 @@ treeherder:
|
||||||
'I': 'Docker Image Builds'
|
'I': 'Docker Image Builds'
|
||||||
'nightly': 'Nightly-related tasks'
|
'nightly': 'Nightly-related tasks'
|
||||||
'nightlyFennec': 'Nightly-related tasks with same APK configuration as Fennec'
|
'nightlyFennec': 'Nightly-related tasks with same APK configuration as Fennec'
|
||||||
'nightlyLegacy': 'Nightly-related tasks that ship to https://play.google.com/store/apps/details?id=org.mozilla.fenix'
|
|
||||||
'production': 'Release-related tasks'
|
'production': 'Release-related tasks'
|
||||||
'Rap': 'Raptor tests'
|
'Rap': 'Raptor tests'
|
||||||
'Rap-P': 'Raptor power tests'
|
'Rap-P': 'Raptor power tests'
|
||||||
|
|
|
@ -39,4 +39,4 @@ jobs:
|
||||||
treeherder:
|
treeherder:
|
||||||
symbol: nimbledroid
|
symbol: nimbledroid
|
||||||
dependencies:
|
dependencies:
|
||||||
build: build-nightly-legacy
|
build: build-nightly
|
||||||
|
|
|
@ -14,7 +14,6 @@ kind-dependencies:
|
||||||
|
|
||||||
only-for-build-types:
|
only-for-build-types:
|
||||||
- nightly
|
- nightly
|
||||||
- nightly-legacy
|
|
||||||
- production
|
- production
|
||||||
|
|
||||||
job-template:
|
job-template:
|
||||||
|
@ -25,16 +24,11 @@ job-template:
|
||||||
channel:
|
channel:
|
||||||
by-build-type:
|
by-build-type:
|
||||||
nightly: nightly
|
nightly: nightly
|
||||||
nightly-legacy: production
|
|
||||||
production: production
|
production: production
|
||||||
dep:
|
dep:
|
||||||
by-level:
|
by-level:
|
||||||
'3': false
|
'3': false
|
||||||
default: true
|
default: true
|
||||||
google-play-track:
|
|
||||||
by-build-type:
|
|
||||||
nightly-legacy: nightly
|
|
||||||
default: ''
|
|
||||||
product: fenix
|
product: fenix
|
||||||
|
|
||||||
treeherder:
|
treeherder:
|
||||||
|
|
|
@ -16,7 +16,7 @@ job-template:
|
||||||
description: Sign Fenix
|
description: Sign Fenix
|
||||||
worker-type:
|
worker-type:
|
||||||
by-build-type:
|
by-build-type:
|
||||||
(fennec-production|nightly|nightly-legacy|production):
|
(fennec-production|nightly|production):
|
||||||
by-level:
|
by-level:
|
||||||
'3': signing
|
'3': signing
|
||||||
default: dep-signing
|
default: dep-signing
|
||||||
|
@ -32,10 +32,6 @@ job-template:
|
||||||
by-level:
|
by-level:
|
||||||
'3': nightly-signing
|
'3': nightly-signing
|
||||||
default: dep-signing
|
default: dep-signing
|
||||||
nightly-legacy:
|
|
||||||
by-level:
|
|
||||||
'3': production-signing
|
|
||||||
default: dep-signing
|
|
||||||
performance-test: dep-signing
|
performance-test: dep-signing
|
||||||
production:
|
production:
|
||||||
by-level:
|
by-level:
|
||||||
|
|
|
@ -18,7 +18,7 @@ transforms = TransformSequence()
|
||||||
@transforms.add
|
@transforms.add
|
||||||
def resolve_keys(config, tasks):
|
def resolve_keys(config, tasks):
|
||||||
for task in tasks:
|
for task in tasks:
|
||||||
for key in ("worker.channel", "worker.dep", "worker.google-play-track"):
|
for key in ("worker.channel", "worker.dep"):
|
||||||
resolve_keyed_by(
|
resolve_keyed_by(
|
||||||
task,
|
task,
|
||||||
key,
|
key,
|
||||||
|
|
|
@ -72,7 +72,6 @@ def build_scriptworker_signing_payload(config, task, task_def):
|
||||||
Required("certificate-alias"): text_type,
|
Required("certificate-alias"): text_type,
|
||||||
Required("channel"): text_type,
|
Required("channel"): text_type,
|
||||||
Required("commit"): bool,
|
Required("commit"): bool,
|
||||||
Optional("google-play-track"): text_type,
|
|
||||||
Required("product"): text_type,
|
Required("product"): text_type,
|
||||||
Required("dep"): bool,
|
Required("dep"): bool,
|
||||||
},
|
},
|
||||||
|
@ -89,9 +88,6 @@ def build_push_apk_payload(config, task, task_def):
|
||||||
"upstreamArtifacts": worker["upstream-artifacts"],
|
"upstreamArtifacts": worker["upstream-artifacts"],
|
||||||
}
|
}
|
||||||
|
|
||||||
if worker.get("google-play-track"):
|
|
||||||
task_def["payload"]["google_play_track"] = worker["google-play-track"]
|
|
||||||
|
|
||||||
scope_prefix = config.graph_config["scriptworker"]["scope-prefix"]
|
scope_prefix = config.graph_config["scriptworker"]["scope-prefix"]
|
||||||
task_def["scopes"].append(
|
task_def["scopes"].append(
|
||||||
"{}:googleplay:product:{}{}".format(
|
"{}:googleplay:product:{}{}".format(
|
||||||
|
|
Loading…
Reference in New Issue