diff --git a/.reuse/dep5 b/.reuse/dep5 index bf1e00aff..17abb308b 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -4,6 +4,6 @@ Files: .github/* nix/nix/* nix/build/install_topfind_196.patch protocols.json me Copyright: 2022 Oxhead Alpha License: LicenseRef-MIT-OA -Files: nix/build/install_topfind_196.patch baking/src/tezos_baking/__init__.py +Files: nix/build/install_topfind_196.patch baking/src/tezos_baking/__init__.py binaries.json Copyright: 2023 Oxhead Alpha License: LicenseRef-MIT-OA diff --git a/binaries.json b/binaries.json index a06d8c8dd..0cdd756ba 100644 --- a/binaries.json +++ b/binaries.json @@ -15,18 +15,22 @@ "tezos-smart-rollup-node-PtNairob" ], "candidates": [ - "tezos-client", - "tezos-admin-client", + "tezos-smart-rollup-client-Proxford", + "tezos-smart-rollup-client-PtNairob", + "tezos-smart-rollup-node-Proxford", + "tezos-smart-rollup-node-PtNairob", + "tezos-baking", + "tezos-sapling-params", + "tezos-accuser-Proxford", + "tezos-baker-Proxford", + "tezos-accuser-PtNairob", + "tezos-baker-PtNairob", "tezos-node", - "tezos-signer", + "tezos-dac-node", + "tezos-dac-client", "tezos-codec", - "tezos-baker-PtMumbai", - "tezos-accuser-PtMumbai", - "tezos-smart-rollup-client-PtMumbai", - "tezos-smart-rollup-node-PtMumbai", - "tezos-baker-PtNairob", - "tezos-accuser-PtNairob", - "tezos-smart-rollup-client-PtNairob", - "tezos-smart-rollup-node-PtNairob" + "tezos-signer", + "tezos-admin-client", + "tezos-client" ] } \ No newline at end of file diff --git a/docker/tests/Dockerfile-fedora-test b/docker/tests/Dockerfile-fedora-test index 77ca771bb..caa77083b 100644 --- a/docker/tests/Dockerfile-fedora-test +++ b/docker/tests/Dockerfile-fedora-test @@ -16,4 +16,4 @@ ENV IS_RELEASED=${repo} COPY docker/tests/test-fedora-binaries.py /tezos-packaging/docker/tests/test-fedora-binaries.py COPY binaries.json /tezos-packaging/binaries.json -CMD [ "python3", "/tezos-packaging/docker/tests/test-fedora-binaries.py", "--no-cleanup" ] +CMD [ "python3", "/tezos-packaging/docker/tests/test-fedora-binaries.py"] diff --git a/docker/tests/Dockerfile-ubuntu-test b/docker/tests/Dockerfile-ubuntu-test index 2307f7263..e04dd3ab8 100644 --- a/docker/tests/Dockerfile-ubuntu-test +++ b/docker/tests/Dockerfile-ubuntu-test @@ -16,4 +16,4 @@ ENV IS_RELEASED=${repo} COPY docker/tests/test-ubuntu-binaries.py /tezos-packaging/docker/tests/test-ubuntu-binaries.py COPY binaries.json /tezos-packaging/binaries.json -CMD [ "python3", "/tezos-packaging/docker/tests/test-ubuntu-binaries.py", "--no-cleanup" ] +CMD [ "python3", "/tezos-packaging/docker/tests/test-ubuntu-binaries.py"] diff --git a/docker/tests/test-fedora-binaries.py b/docker/tests/test-fedora-binaries.py index 28e57561f..852180d6d 100644 --- a/docker/tests/test-fedora-binaries.py +++ b/docker/tests/test-fedora-binaries.py @@ -6,7 +6,8 @@ import json import os -def test(binaries, cleanup): + +def test(binaries): subprocess.run("sudo dnf update -y", shell=True, capture_output=True) processed_binaries = [] for binary in binaries: @@ -27,32 +28,20 @@ def test(binaries, cleanup): except Exception as e: print(f"Exception happened when trying to execute tests for {binary}.\n") raise e - if cleanup: - for binary in processed_binaries: - remove_res = subprocess.run( - f"dnf remove {binary}", shell=True, capture_output=True - ) - assert remove_res.returncode == 0 if __name__ == "__main__": - cleanup = True - - f = open('/tezos-packaging/binaries.json') + f = open("/tezos-packaging/binaries.json") data = json.load(f) - f.close() binaries = [] - is_released = os.environ['IS_RELEASED'] - if is_released == 'Tezos': - binaries = data['released'] - elif is_released == 'Tezos-rc': - binaries = data['candidates'] + is_released = os.environ["IS_RELEASED"] + if is_released == "Tezos": + binaries = data["released"] + elif is_released == "Tezos-rc": + binaries = data["candidates"] else: raise "Incorrect argument" - if len(sys.argv) > 3 and sys.argv[1] == "--no-cleanup": - cleanup = False - - test(binaries, cleanup) \ No newline at end of file + test(binaries) diff --git a/docker/tests/test-ubuntu-binaries.py b/docker/tests/test-ubuntu-binaries.py index 063f9a40b..f14e71582 100644 --- a/docker/tests/test-ubuntu-binaries.py +++ b/docker/tests/test-ubuntu-binaries.py @@ -6,7 +6,8 @@ import json import os -def test(binaries, cleanup): + +def test(binaries): subprocess.run("apt update -y", shell=True, capture_output=True) processed_binaries = [] for binary in binaries: @@ -27,32 +28,21 @@ def test(binaries, cleanup): except Exception as e: print(f"Exception happened when trying to execute tests for {binary}.\n") raise e - if cleanup: - for binary in processed_binaries: - remove_res = subprocess.run( - f"apt remove {binary}", shell=True, capture_output=True - ) - assert remove_res.returncode == 0 if __name__ == "__main__": - cleanup = True - - f = open('/tezos-packaging/binaries.json') + f = open("/tezos-packaging/binaries.json") data = json.load(f) f.close() binaries = [] - is_released = os.environ['IS_RELEASED'] - if is_released == 'tezos': - binaries = data['released'] - elif is_released == 'tezos-rc': - binaries = data['candidates'] + is_released = os.environ["IS_RELEASED"] + if is_released == "tezos": + binaries = data["released"] + elif is_released == "tezos-rc": + binaries = data["candidates"] else: raise "Incorrect argument" - if len(sys.argv) > 3 and sys.argv[1] == "--no-cleanup": - cleanup = False - - test(binaries, cleanup) + test(binaries)