summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* .gitlab-ci.yml: Only build non-kbas builds in the master branchjjardon/bo_kbas_build_only_masterJavier Jardón2017-05-261-0/+8
| | | | This will hopefully unblock the Merge Process a little
* Merge branch 'benbrown/note-fixes' into 'master'Ben Brown2017-05-233-23/+29
|\ | | | | | | | | Miscellaneous/release note fixes See merge request !359
| * Don't catch KeyboardInterruptbenbrown/note-fixesBen Brown2017-05-221-1/+1
| |
| * Use empty dict instead of try/except on NoneBen Brown2017-05-221-5/+2
| |
| * Only check `git log` if refs are differentBen Brown2017-05-221-8/+9
| |
| * Only strip when path begins with './'Ben Brown2017-05-221-1/+4
| |
| * Sanitise int and unicode fieldsBen Brown2017-05-221-2/+2
| |
| * Ignore 'repourl'Ben Brown2017-05-221-1/+1
| |
| * Pass directory parameter to Morphs()Ben Brown2017-05-221-1/+1
| |
| * Fix refs used for release commandBen Brown2017-05-221-4/+5
| |
| * Fix release-command typoBen Brown2017-05-221-1/+1
| |
| * Don't check git history with nothing to compare againstBen Brown2017-05-221-1/+2
| | | | | | | | | | | | Skip when: * Chunk lacks a 'repo' field. * Chunk did not previously exist (old_def is not set).
| * Add missing update_mirror importBen Brown2017-05-221-1/+3
| |
| * Don't set _trees if file is emptyBen Brown2017-05-221-1/+2
|/
* Merge branch 'staging/jonathan/rpm-existing-dirs-workaround' into 'master'Javier Jardón2017-05-191-2/+12
|\ | | | | | | | | rpm: Work around os.path.exists not catching dirs that exist See merge request !357
| * rpm: Work around os.path.exists not catching dirs that existstaging/jonathan/rpm-existing-dirs-workaroundJonathan Maw2017-05-191-2/+12
|/ | | | | The true cause couldn't be found (error was intermittent), but this should work around it, and if it re-emerges, we will know something new.
* Merge branch 'benbrown/missing-import' into 'master'Javier Jardón2017-05-191-0/+1
|\ | | | | | | | | Add missing tempfile import to rpm.py See merge request !356
| * Add missing tempfile import to rpm.pybenbrown/missing-importBen Brown2017-05-191-0/+1
|/
* Merge branch 'staging/jonathan/rpm-caching' into 'master' devcurmudgeon2017-05-175-36/+220
|\ | | | | | | | | Cache RPMs locally and remotely when assembling RPMs See merge request !355
| * Make rpms use a local and remote artifact cachestaging/jonathan/rpm-cachingJonathan Maw2017-05-171-25/+197
| | | | | | | | | | This will upload RPMs to kbas if they're built, unless kbas-upload is manually set to something that doesn't include "rpm"
| * sandbox: Make it possible to hide the logging of which command was runJonathan Maw2017-05-172-4/+4
| | | | | | | | | | | | We use invocations of 'rpm' to get information from rpms. This makes rpm generation barely-readable unless we make the logs hide this.
| * Allow rpm uploads without having to tarBen Brown2017-05-171-2/+8
| |
| * Bump artifact version for rpm-metadataBen Brown2017-05-171-1/+2
| |
| * Add 'rpm-metadata' in cache-keyBen Brown2017-05-171-0/+4
| |
| * Save 'artifact-version' for reuseBen Brown2017-05-171-4/+5
|/
* Merge branch 'staging/jonathan/rpm-export-parallel' into 'master' devcurmudgeon2017-05-121-1/+2
|\ | | | | | | | | Do not parallelize rpm assembly See merge request !354
| * Do not parallelize rpm assemblystaging/jonathan/rpm-export-parallelJonathan Maw2017-05-121-1/+2
|/
* Merge branch 'tristan/rpm-export-rebase' into 'master' devcurmudgeon2017-05-125-20/+452
|\ | | | | | | | | Add RPM generation functionality See merge request !353
| * Class failure to generate a spec as failure if rpm-metadata is definedtristan/rpm-export-rebaseBen Brown2017-05-111-2/+4
| |
| * Use spec's release field, plus sha when generating rpmsJonathan Maw2017-05-111-1/+6
| | | | | | | | i.e. the release field is now <release>git<sha>
| * rpm: use 'version' metadata field instead of timeJonathan Maw2017-05-112-15/+10
| |
| * rpm: Fix undefined 'result' when generating rpms with a whitelistJonathan Maw2017-05-111-0/+1
| |
| * Do not return failure if we don't package non-chunksBen Brown2017-05-111-1/+1
| |
| * rpm: Add Requires metadataJonathan Maw2017-05-111-0/+6
| |
| * rpm: Make macro expansion skip shelling out if no %Jonathan Maw2017-05-111-0/+3
| | | | | | | | i.e. the string does not contain any statements to expand macros.
| * rpm: Fix provides not being set for main package sometimesJonathan Maw2017-05-111-3/+4
| | | | | | | | Specifically, when package names are identified by way of macros.
| * Re-raise SystemExit from sandboxBen Brown2017-05-111-2/+2
| |
| * Exit with an error if we failed to generate all rpmsBen Brown2017-05-111-2/+8
| |
| * Yield a tuple containing the callback result from foreach_def()Ben Brown2017-05-111-5/+12
| | | | | | | | | | The first item in the tuple being whether the definitions/chunk was successfully processed.
| * Return result from package_one_rpmBen Brown2017-05-111-0/+3
| |
| * Return same tuple on failure in run_sandboxedBen Brown2017-05-111-1/+1
| |
| * Ensure success variable is set to exit resultBen Brown2017-05-111-2/+2
| |
| * Fix expand_macro so it returns correct outputBen Brown2017-05-111-1/+5
| | | | | | | | Log output after the call, we require output to not be None.
| * Fix run_sandbox call so stdout and stderr are returnedBen Brown2017-05-111-12/+14
| | | | | | | | | | | | Add 'run_logged' optional parameter to force run_sandbox to return output rather than write directly to the build log. Subprocess will return None for stdout when set to redirect to a file.
| * Strip whitespace from `rpm --eval` process outputBen Brown2017-05-111-1/+1
| |
| * Add missing whitespace in expand_macro commandBen Brown2017-05-111-1/+2
| |
| * Fix check for writing %package headingsBen Brown2017-05-111-1/+1
| |
| * rpm: Handle packages without a "files" sectionJonathan Maw2017-05-111-2/+2
| |
| * Revert "If definition contains sha:, it always overrides ref:"Ben Brown2017-05-112-6/+0
| | | | | | | | | | | | | | This is a duplicate commit that has emerged from a faulty rebase. We don't want to be force pushing to this branch any more. This reverts commit 9c9305806087bc70c01396cbbb365bf175b89a98.
| * rpm: Check package name against expanded namesJonathan Maw2017-05-111-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | During rpm spec generation, we check whether a given package is the main package, to identify whether fields are added under a %package heading or not. It is valid rpm spec syntax to define the package name in terms of macros, so this commit adds checking against the expanded name. Rather than hand-writing substitutions to expand the macros, this commit uses rpm's "--eval" argument to check the value in a sandbox.
View Lorry Controller Status