patman is now just a stub, so drop its requirements file and its 'patman test' run from the Azure and GitLab pipelines.
Signed-off-by: Simon Glass <[email protected]> --- .azure-pipelines.yml | 5 +---- .gitlab-ci.yml | 7 +++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 4417ef4e5a5..a95e4ce17c3 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 export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt @@ -177,7 +176,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 @@ -196,7 +194,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 \ asteval pylint==3.3.4 pyopenssl export PATH=${PATH}:~/.local/bin diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 245e422d72f..d3aa89e14aa 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; export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; @@ -233,7 +233,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 @@ -244,7 +243,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 asteval pylint==3.3.4 pyopenssl - export PATH=${PATH}:~/.local/bin - echo "[MASTER]" >> .pylintrc -- 2.43.0
