diff options
| -rw-r--r-- | .azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d650f0acbc7..5bda11a0309 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -146,7 +146,7 @@ stages: make tools-only_config envtools -j$(nproc) - job: utils - displayName: 'Run binman, buildman, dtoc, Kconfig and patman testsuites' + displayName: 'Run binman, buildman, dtoc and Kconfig testsuites' pool: vmImage: $(ubuntu_vm) container: @@ -163,7 +163,6 @@ stages: pip install -r test/py/requirements.txt \ -r tools/binman/requirements.txt \ -r tools/buildman/requirements.txt \ - -r tools/patman/requirements.txt \ -r tools/u_boot_pylib/requirements.txt \ -r scripts/dtc/pylibfdt/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only @@ -178,7 +177,6 @@ stages: COVERAGE_FILE=/tmp/.coverage ./tools/binman/binman ${TOOLPATH} test -T ./tools/buildman/buildman -t ./tools/dtoc/dtoc -t - ./tools/patman/patman test make O=${UBOOT_TRAVIS_BUILD_DIR} testconfig - job: pylint @@ -197,7 +195,6 @@ stages: pip install -r test/py/requirements.txt \ -r tools/binman/requirements.txt \ -r tools/buildman/requirements.txt \ - -r tools/patman/requirements.txt \ -r tools/u_boot_pylib/requirements.txt \ -r scripts/dtc/pylibfdt/requirements.txt \ asteval pylint==3.3.4 pyopenssl diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d9b78f5060..c2716af1904 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -206,7 +206,7 @@ Build allyesconfig, tools-only and envtools: make mrproper; make tools-only_config envtools -j$(nproc) -Run binman, buildman, dtoc, Kconfig and patman testsuites: +Run binman, buildman, dtoc and Kconfig testsuites: extends: .testsuites tags: - ${DEFAULT_AMD64_TAG} @@ -218,7 +218,7 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: python3 -m venv /tmp/venv; . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt -r tools/binman/requirements.txt - -r tools/buildman/requirements.txt -r tools/patman/requirements.txt + -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt -r scripts/dtc/pylibfdt/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only; @@ -234,7 +234,6 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: ./tools/binman/binman ${TOOLPATH} test -T; ./tools/buildman/buildman -t; ./tools/dtoc/dtoc -t; - ./tools/patman/patman test; make testconfig # Check for any pylint regressions @@ -245,7 +244,7 @@ Run pylint: - python3 -m venv /tmp/venv - . /tmp/venv/bin/activate - pip install -r test/py/requirements.txt -r tools/binman/requirements.txt - -r tools/buildman/requirements.txt -r tools/patman/requirements.txt + -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt -r scripts/dtc/pylibfdt/requirements.txt asteval pylint==3.3.4 pyopenssl - export PATH=${PATH}:~/.local/bin |