From 64f4649a4cc0c73c55b073fb99c9f3d3d1a612a0 Mon Sep 17 00:00:00 2001 From: Eniko Nagy <4188977+eenagy@users.noreply.github.com> Date: Sat, 27 Apr 2024 10:44:20 +0700 Subject: [PATCH] chore: disable tests and add lintian as step --- .github/workflows/pkgbuilder-deps.yml | 7 +++++-- .../eth-node-besu/23.10.1-1/src/debian/rules | 3 ++- .../eth-node-erigon/2.53.2-1/src/debian/rules | 3 ++- .../debian/eth-node-geth.lintian-overrides | 2 -- .../eth-node-geth/1.13.4-1/src/debian/rules | 3 ++- .../4.5.0-1/src/debian/rules | 21 ++++++++++--------- .../1.11.3-1/src/debian/rules | 9 ++++---- .../1.21.1-1/src/debian/rules | 3 ++- .../eth-node-nimbus-eth2.lintian-overrides | 6 +++--- .../24.3.0-1/src/debian/rules | 5 +++-- .../eth-node-prysm/4.1.1-1/src/debian/rules | 3 ++- .../eth-node-teku/23.10.0-1/src/debian/rules | 3 ++- 12 files changed, 39 insertions(+), 29 deletions(-) diff --git a/.github/workflows/pkgbuilder-deps.yml b/.github/workflows/pkgbuilder-deps.yml index a56e5a381..32e7a8b19 100644 --- a/.github/workflows/pkgbuilder-deps.yml +++ b/.github/workflows/pkgbuilder-deps.yml @@ -73,8 +73,11 @@ jobs: pkg-builder build-env create ${{ inputs.codename }}/${{inputs.package-name}}/${{ inputs.package-version-with-revision }}/pkg-builder.toml echo "${HOME}/.cache/sbuild/bookworm-amd64.tar.gz" >> $GITHUB_PATH - - name: Create package - run: pkg-builder package ${{ inputs.codename }}/${{inputs.package-name}}/${{ inputs.package-version-with-revision }}/pkg-builder.toml false false + - name: package + run: pkg-builder package ${{ inputs.codename }}/${{inputs.package-name}}/${{ inputs.package-version-with-revision }}/pkg-builder.toml false false false + + - name: lintian + run: pkg-builder lintian ${{ inputs.codename }}/${{inputs.package-name}}/${{ inputs.package-version-with-revision }}/pkg-builder.toml - name: piuparts run: | diff --git a/debian-12/eth-node-besu/23.10.1-1/src/debian/rules b/debian-12/eth-node-besu/23.10.1-1/src/debian/rules index 01ddef0e1..95a2e4ea1 100644 --- a/debian-12/eth-node-besu/23.10.1-1/src/debian/rules +++ b/debian-12/eth-node-besu/23.10.1-1/src/debian/rules @@ -6,8 +6,9 @@ override_dh_auto_build: ./gradlew distTar installDist +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - ./gradlew test +# ./gradlew test override_dh_auto_install: # This relies on make install script diff --git a/debian-12/eth-node-erigon/2.53.2-1/src/debian/rules b/debian-12/eth-node-erigon/2.53.2-1/src/debian/rules index d62d0ecd7..9e008f1a6 100644 --- a/debian-12/eth-node-erigon/2.53.2-1/src/debian/rules +++ b/debian-12/eth-node-erigon/2.53.2-1/src/debian/rules @@ -6,8 +6,9 @@ override_dh_dwz: # skip of optimization of DWARF debug information in ELF binaries via dwz +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - make -j1 test +# make -j1 test override_dh_auto_install: # This relies on make install script diff --git a/debian-12/eth-node-geth/1.13.4-1/src/debian/eth-node-geth.lintian-overrides b/debian-12/eth-node-geth/1.13.4-1/src/debian/eth-node-geth.lintian-overrides index 9f741c388..2a47a88b5 100644 --- a/debian-12/eth-node-geth/1.13.4-1/src/debian/eth-node-geth.lintian-overrides +++ b/debian-12/eth-node-geth/1.13.4-1/src/debian/eth-node-geth.lintian-overrides @@ -1,3 +1 @@ -# TODO this is a bug, let's wait and see if compiled with different flags will solve it -# waiting for the verify build task eth-node-geth: statically-linked-binary [usr/lib/eth-node-geth/bin/rlpdump] \ No newline at end of file diff --git a/debian-12/eth-node-geth/1.13.4-1/src/debian/rules b/debian-12/eth-node-geth/1.13.4-1/src/debian/rules index 6f0d9478b..ce77664f4 100644 --- a/debian-12/eth-node-geth/1.13.4-1/src/debian/rules +++ b/debian-12/eth-node-geth/1.13.4-1/src/debian/rules @@ -21,5 +21,6 @@ override_dh_auto_clean: # on bookworm clean succeeds, even if dependency is not installed -make -j1 clean +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - make -j1 test \ No newline at end of file +# make -j1 test \ No newline at end of file diff --git a/debian-12/eth-node-lighthouse/4.5.0-1/src/debian/rules b/debian-12/eth-node-lighthouse/4.5.0-1/src/debian/rules index 4f418a0c7..a1a24f1c9 100644 --- a/debian-12/eth-node-lighthouse/4.5.0-1/src/debian/rules +++ b/debian-12/eth-node-lighthouse/4.5.0-1/src/debian/rules @@ -15,17 +15,18 @@ export FEATURES=gnosis,slasher-lmdb,slasher-mdbx,jemalloc override_dh_auto_build: dh_auto_build +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - # # # Install additional test dependency - cd /tmp && curl -s -L https://github.com/foundry-rs/foundry/releases/download/nightly-ca67d15f4abd46394b324c50e21e66f306a1162d/foundry_nightly_linux_amd64.tar.gz -o foundry_nightly_linux_amd64.tar.gz - cd /tmp && tar xvf foundry_nightly_linux_amd64.tar.gz - cp /tmp/anvil $(HOME)/.cargo/bin - anvil --version # check if it correctly installed - # # TODO include docker tests (watch) - # web3signer_tests also fail if run by workspace, not sure why (web3signer_tests) - cargo test --workspace --release --exclude ef_tests --exclude beacon_chain --exclude slasher --exclude watch --exclude web3signer_tests - # run web3signer tests seperately - cargo test -p web3signer_tests --lib + # # # # Install additional test dependency + # cd /tmp && curl -s -L https://github.com/foundry-rs/foundry/releases/download/nightly-ca67d15f4abd46394b324c50e21e66f306a1162d/foundry_nightly_linux_amd64.tar.gz -o foundry_nightly_linux_amd64.tar.gz + # cd /tmp && tar xvf foundry_nightly_linux_amd64.tar.gz + # cp /tmp/anvil $(HOME)/.cargo/bin + # anvil --version # check if it correctly installed + # # # TODO include docker tests (watch) + # # web3signer_tests also fail if run by workspace, not sure why (web3signer_tests) + # cargo test --workspace --release --exclude ef_tests --exclude beacon_chain --exclude slasher --exclude watch --exclude web3signer_tests + # # run web3signer tests seperately + # cargo test -p web3signer_tests --lib override_dh_auto_install: # This relies on make install script diff --git a/debian-12/eth-node-lodestar/1.11.3-1/src/debian/rules b/debian-12/eth-node-lodestar/1.11.3-1/src/debian/rules index 34a6d30b1..7afd19862 100755 --- a/debian-12/eth-node-lodestar/1.11.3-1/src/debian/rules +++ b/debian-12/eth-node-lodestar/1.11.3-1/src/debian/rules @@ -4,11 +4,12 @@ export INSTALL_DIR=/usr/lib/eth-node-lodestar %: dh $@ +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - yarn test:unit - # TODO Enable docker tests, docker does not work under chroot, yet - # yarn test:e2e - yarn test:e2e:sim + # yarn test:unit + # # TODO Enable docker tests, docker does not work under chroot, yet + # # yarn test:e2e + # yarn test:e2e:sim override_dh_auto_build: yarn install --frozen-lockfile diff --git a/debian-12/eth-node-nethermind/1.21.1-1/src/debian/rules b/debian-12/eth-node-nethermind/1.21.1-1/src/debian/rules index 90e9d1bc7..9ef5a2b61 100644 --- a/debian-12/eth-node-nethermind/1.21.1-1/src/debian/rules +++ b/debian-12/eth-node-nethermind/1.21.1-1/src/debian/rules @@ -10,7 +10,8 @@ override_dh_auto_build: # TODO this should come from the build specs find src/Nethermind/Nethermind.Runner/bin/release/net7.0/runtimes -mindepth 1 -maxdepth 1 -type d ! -name 'linux-x64' -exec rm -r {} \; - +# TODO reenable tests, disabled to speed up testing autopkgtests +# TODO fix tests override_dh_auto_test: # # Skip tests as they are failing # Run Nethermind tests: diff --git a/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/eth-node-nimbus-eth2.lintian-overrides b/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/eth-node-nimbus-eth2.lintian-overrides index 86c012924..352a6f437 100644 --- a/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/eth-node-nimbus-eth2.lintian-overrides +++ b/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/eth-node-nimbus-eth2.lintian-overrides @@ -1,4 +1,4 @@ # TODO bugs -eth-node-nimbus-eth2: embedded-library libminiupnpc [usr/lib/eth-node-nimbus-eth2/lib/build/nimbus_beacon_node] -eth-node-nimbus-eth2: embedded-library libminiupnpc [usr/lib/eth-node-nimbus-eth2/lib/build/nimbus_light_client] -eth-node-nimbus-eth2: embedded-library libminiupnpc [usr/lib/eth-node-nimbus-eth2/lib/build/all_tests] \ No newline at end of file +eth-node-nimbus-eth2: embedded-library libminiupnpc [usr/lib/eth-node-nimbus-eth2/build/nimbus_beacon_node] +eth-node-nimbus-eth2: embedded-library libminiupnpc [usr/lib/eth-node-nimbus-eth2/build/nimbus_light_client] +eth-node-nimbus-eth2: embedded-library libminiupnpc [usr/lib/eth-node-nimbus-eth2/build/all_tests] \ No newline at end of file diff --git a/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/rules b/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/rules index 0e2322fd1..e3665917b 100644 --- a/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/rules +++ b/debian-12/eth-node-nimbus-eth2/24.3.0-1/src/debian/rules @@ -24,6 +24,7 @@ override_dh_auto_clean: # on bookworm clean succeeds, even if dependency is not installed -make -j1 clean +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - # -make update - make -j1 all_tests + # # -make update + # make -j1 all_tests diff --git a/debian-12/eth-node-prysm/4.1.1-1/src/debian/rules b/debian-12/eth-node-prysm/4.1.1-1/src/debian/rules index cd12433c1..f96f1271c 100644 --- a/debian-12/eth-node-prysm/4.1.1-1/src/debian/rules +++ b/debian-12/eth-node-prysm/4.1.1-1/src/debian/rules @@ -6,8 +6,9 @@ export PATH:=$(PATH):$(GO_BIN_HOME)/bin go install github.com/bazelbuild/bazelisk@v1.18.0 dh $@ +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - CGO_CFLAGS="-O2 -D__BLST_PORTABLE__" bazelisk test //.. + # CGO_CFLAGS="-O2 -D__BLST_PORTABLE__" bazelisk test //.. override_dh_auto_build: bazelisk build //cmd/beacon-chain:beacon-chain --config=release diff --git a/debian-12/eth-node-teku/23.10.0-1/src/debian/rules b/debian-12/eth-node-teku/23.10.0-1/src/debian/rules index 01ddef0e1..e5cce1396 100644 --- a/debian-12/eth-node-teku/23.10.0-1/src/debian/rules +++ b/debian-12/eth-node-teku/23.10.0-1/src/debian/rules @@ -6,8 +6,9 @@ override_dh_auto_build: ./gradlew distTar installDist +# TODO reenable tests, disabled to speed up testing autopkgtests override_dh_auto_test: - ./gradlew test + # ./gradlew test override_dh_auto_install: # This relies on make install script