schedulers: Ensure branch is set correctly for all release selections

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-08-14 10:59:24 +01:00
parent 882e18b9ea
commit dc8b7d1fce

View File

@ -97,12 +97,13 @@ schedulers.append(sched.ForceScheduler(
required=False), required=False),
properties=[ properties=[
ReleaseSelector( ReleaseSelector(
name="targetbranch", name="branchselector",
default="master", default="master",
label="Release Shortcut Selector", label="Release Shortcut Selector",
choices=["master", "master-next", "mut", "rocko", "sumo", "pyro", "morty"], choices=["master", "master-next", "mut", "rocko", "sumo", "pyro", "morty"],
selectors={ selectors={
'master': { 'master': {
'branch': 'master',
'branch_poky': 'master', 'branch_poky': 'master',
'branch_bitbake': 'master', 'branch_bitbake': 'master',
'branch_eclipse-poky-neon': 'neon-master', 'branch_eclipse-poky-neon': 'neon-master',
@ -115,6 +116,7 @@ schedulers.append(sched.ForceScheduler(
'branch_oecore': 'master', 'branch_oecore': 'master',
}, },
'master-next': { 'master-next': {
'branch': 'master',
'branch_poky': 'master-next', 'branch_poky': 'master-next',
'branch_bitbake': 'master-next', 'branch_bitbake': 'master-next',
'branch_eclipse-poky-neon': 'neon-master', 'branch_eclipse-poky-neon': 'neon-master',
@ -127,6 +129,7 @@ schedulers.append(sched.ForceScheduler(
'branch_oecore': 'master-next', 'branch_oecore': 'master-next',
}, },
'mut': { 'mut': {
'branch': 'master',
'branch_poky': 'ross/mut', 'branch_poky': 'ross/mut',
'repo_poky': 'git://git.yoctoproject.org/poky-contrib', 'repo_poky': 'git://git.yoctoproject.org/poky-contrib',
'branch_bitbake': 'master', 'branch_bitbake': 'master',
@ -140,6 +143,7 @@ schedulers.append(sched.ForceScheduler(
'branch_oecore': 'master', 'branch_oecore': 'master',
}, },
'sumo': { 'sumo': {
'branch': 'sumo',
'branch_poky': 'sumo', 'branch_poky': 'sumo',
'branch_bitbake': '1.38', 'branch_bitbake': '1.38',
'branch_eclipse-poky-neon': 'neon/sumo', 'branch_eclipse-poky-neon': 'neon/sumo',
@ -152,6 +156,7 @@ schedulers.append(sched.ForceScheduler(
'branch_oecore': 'sumo', 'branch_oecore': 'sumo',
}, },
'rocko': { 'rocko': {
'branch': 'rocko',
'branch_poky': 'rocko', 'branch_poky': 'rocko',
'branch_bitbake': '1.36', 'branch_bitbake': '1.36',
'branch_eclipse-poky-neon': 'neon/rocko', 'branch_eclipse-poky-neon': 'neon/rocko',
@ -164,6 +169,7 @@ schedulers.append(sched.ForceScheduler(
'branch_oecore': 'rocko', 'branch_oecore': 'rocko',
}, },
'pyro': { 'pyro': {
'branch': 'pyro',
'branch_poky': 'pyro', 'branch_poky': 'pyro',
'branch_bitbake': '1.34', 'branch_bitbake': '1.34',
'branch_eclipse-poky-neon': 'neon/pyro', 'branch_eclipse-poky-neon': 'neon/pyro',
@ -176,6 +182,7 @@ schedulers.append(sched.ForceScheduler(
'branch_oecore': 'pyro', 'branch_oecore': 'pyro',
}, },
'morty': { 'morty': {
'branch': 'morty',
'branch_poky': 'morty', 'branch_poky': 'morty',
'branch_bitbake': '1.32', 'branch_bitbake': '1.32',
'branch_eclipse-poky-neon': 'neon/morty', 'branch_eclipse-poky-neon': 'neon/morty',