gitlab-ci: Add USER environment variable to buildman/patman tests
PATCH 1/2 gitlab-ci: Add USER environment variable to buildman/patman tests
The way that some of the tests here are designed, they expect USER to be set in the environment. This is not the case in the docker images, so set a reasonable value.
Signed-off-by Tom Rini <[email protected]>
--- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+)
.gitlab-ci.yml +2 -0
@@ -152,12 +152,14 @@ Run patman testsuite: script: - git config --global user.name "GitLab CI Runner" - git config --global user.email trini at konsulko.com + - export USER=gitlab - ./tools/patman/patman --test Run buildman testsuite: tags: [ 'all' ] stage: testsuites script: + - export USER=gitlab - ./tools/buildman/buildman -t Run binman and dtoc testsuite:
Signature · 1 line
2.7.4
PATCH 2/2 gitlab-ci: Consolidate some testsuite jobs
We do not need to split binman, buildman, dtoc and patman test suite runs into 3 jobs. Instead, run them as a single job.
Signed-off-by Tom Rini <[email protected]>
--- .gitlab-ci.yml | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-)
.gitlab-ci.yml +15 -27
@@ -145,36 +145,24 @@ Build tools-only: script: - make tools-only_config tools-only -j$(nproc) -# Run various tool tests -Run patman testsuite: +Run binman, buildman, dtoc and patman testsuites: tags: [ 'all' ] stage: testsuites script: - - git config --global user.name "GitLab CI Runner" - - git config --global user.email trini at konsulko.com - - export USER=gitlab - - ./tools/patman/patman --test - -Run buildman testsuite: - tags: [ 'all' ] - stage: testsuites - script: - - export USER=gitlab - - ./tools/buildman/buildman -t - -Run binman and dtoc testsuite: - tags: [ 'all' ] - stage: testsuites - script: - - virtualenv /tmp/venv - - . /tmp/venv/bin/activate - - pip install pyelftools - - export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/sandbox_spl; - ./tools/buildman/buildman -P sandbox_spl && - export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; - export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; - ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test && - ./tools/dtoc/dtoc -t + - git config --global user.name "GitLab CI Runner"; + git config --global user.email trini at konsulko.com; + export USER=gitlab; + virtualenv /tmp/venv; + . /tmp/venv/bin/activate; + pip install pyelftools; + export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/sandbox_spl; + export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; + export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; + ./tools/buildman/buildman -P sandbox_spl; + ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; + ./tools/buildman/buildman -t; + ./tools/dtoc/dtoc -t; + ./tools/patman/patman --test # Test sandbox with test.py sandbox test.py:
Signature · 1 line
2.7.4