diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 10:09:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 15:19:18 -0400 |
| commit | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (patch) | |
| tree | 3d8f6a1a336809c52d95237e85b0cb7aaf93e2df /.gitlab-ci.yml | |
| parent | edbe0d5664af28005f14bf02f48ca95bd334c0b7 (diff) | |
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 <trini@konsulko.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98e03d6ffb..84e79bf032 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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@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@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: |