diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-06-02 20:17:35 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-06-02 20:17:35 +0200 |
| commit | b7b65449c824bc5cd7fdd0fba4a190fb47090e68 (patch) | |
| tree | 8530ca153e28525efee561f836fba56539d4f410 /utils | |
| parent | 99f8e91d6641505e85528ca6e85b88a36888f9e6 (diff) | |
Add prerelease type to generatorjellyfish_9.99.1jellyfish/9.99.19.99.1
Allow the tool to generate jobs against the prerelease location.
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I7f00ee52ad85b2aecc52679da4e98857a5dd59cb
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/agljobtemplate.py | 5 | ||||
| -rwxr-xr-x | utils/create-jobs.py | 8 | ||||
| -rwxr-xr-x | utils/job-prereq.py | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index 61fc82b..c9d07f5 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -134,11 +134,12 @@ class Agljobtemplate(object): build_name = machine + '-nogfx' if (machine == 'h3ulcb-kf'): build_name = 'h3ulcb-nogfx' + machine_frag_url = 'h3ulcb' if (machine == 'm3ulcb'): build_name = machine + '-nogfx' if machine == "upsquare": - machine_frag_url = "intel-corei7-64" - build_name = "intel-corei7-64" + machine_frag_url = "qemux86-64" + build_name = "qemux86-64" if vcs_branch == "master" and (machine == "raspberrypi4" or machine == "raspberrypi4-64"): machine_frag_url = "raspberrypi4-64" build_name = "raspberrypi4" diff --git a/utils/create-jobs.py b/utils/create-jobs.py index 28eb643..b2a7363 100755 --- a/utils/create-jobs.py +++ b/utils/create-jobs.py @@ -19,7 +19,7 @@ def parse_cmdline(machines, tests, rfs_types): parser.add_argument('--url', '-u', action='store', dest='url', help="If using a custom URL specify it there. The files will be fetched from this URL.") parser.add_argument('--build-type', dest='build_type', action='store', - help="The type of build, can be one of: {'ci', 'daily', 'weekly', 'release'}.", + help="The type of build, can be one of: {'ci', 'daily', 'weekly', 'release', 'prerelease'}.", default="default") parser.add_argument('--branch', dest='vcs_branch', action='store', help='The build branch.') @@ -81,7 +81,11 @@ def parse_cmdline(machines, tests, rfs_types): if (args.build_type == "release") and not args.url: if (not args.vcs_branch) or (not args.version): - parser.error("when using '--build-type' '--branch' and '--versiom' arguments needs to be set.") + parser.error("when using '--build-type' '--branch' and '--version' arguments needs to be set.") + + if (args.build_type == "prerelease") and not args.url: + if (not args.vcs_branch) or (not args.version): + parser.error("when using '--build-type' '--branch' and '--version' arguments needs to be set.") return args diff --git a/utils/job-prereq.py b/utils/job-prereq.py index c04959b..08531cd 100755 --- a/utils/job-prereq.py +++ b/utils/job-prereq.py @@ -39,7 +39,7 @@ def parse_cmdline(machines): parser.add_argument('--nbdroot', action='store_true') parser.add_argument('--build-type', action='store', dest='build_type', nargs=3, - help="The type of build. It defines the URL to upload to.", + help="The type of build. It defines the URL to upload to. (ci, release, prerelease)", required=True) parser.add_argument('--branch', dest='vcs_branch', action='store', default='master', help='The build branch.') |