From 524caf0653c3d63a5961055ef0b46b82074ff6b5 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Fri, 7 Feb 2025 10:59:30 +0100 Subject: [PATCH 1/3] Drop the generic_lockfile.yaml file It's pretty much just a copy of artifacts.lock.yaml. The presence of this file is just historical and goes back to development time of the feature before it was decided that the default name is NOT to be 'generic_lockfile.yaml'. Signed-off-by: Erik Skultety --- generic_lockfile.yaml | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 generic_lockfile.yaml diff --git a/generic_lockfile.yaml b/generic_lockfile.yaml deleted file mode 100644 index 4b44ed7..0000000 --- a/generic_lockfile.yaml +++ /dev/null @@ -1,10 +0,0 @@ -metadata: - version: "1.0" -artifacts: - - download_url: https://github.com/cachito-testing/cachi2-generic/archive/refs/tags/v1.0.0.zip - checksums: - sha256: 4fbcaa2a8d17c1f8042578627c122361ab18b7973311e7e9c598696732902f87 - - download_url: https://github.com/cachito-testing/cachi2-generic/archive/refs/tags/v2.0.0.zip - target: archive.zip - checksums: - sha256: 386428a82f37345fa24b74068e0e79f4c1f2ff38d4f5c106ea14de4a2926e584 From e8aa5162f345931bd524095d1f175aa1b394f868 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Fri, 7 Feb 2025 11:09:23 +0100 Subject: [PATCH 2/3] Replace the download URLs in the lockfile to point to our own tarballs When this test was created, an artificial release was created in the dedicated (back then) repository for the test only to reference it in the lockfile for test purposes. We consolidated all integration test cases to a single repository with the origin potentially removed in the future, so to make tests stable, we should point them to our own regular release tarballs. Signed-off-by: Erik Skultety --- artifacts.lock.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/artifacts.lock.yaml b/artifacts.lock.yaml index 743f98b..c776085 100644 --- a/artifacts.lock.yaml +++ b/artifacts.lock.yaml @@ -1,8 +1,8 @@ metadata: version: "1.0" artifacts: - - download_url: https://github.com/cachito-testing/cachi2-generic/archive/refs/tags/v1.0.0.zip - checksum: "sha256:4fbcaa2a8d17c1f8042578627c122361ab18b7973311e7e9c598696732902f87" - - download_url: https://github.com/cachito-testing/cachi2-generic/archive/refs/tags/v2.0.0.zip - filename: archive.zip - checksum: "sha256:386428a82f37345fa24b74068e0e79f4c1f2ff38d4f5c106ea14de4a2926e584" + - download_url: https://github.com/hermetoproject/cachi2/archive/refs/tags/0.1.0.tar.gz + checksum: "sha256:2cdd9271f5bde6eeee56dda7f0fbb73b9a28b74bb0784d9e3170422b234ebd82" + - download_url: https://github.com/hermetoproject/cachi2/archive/refs/tags/0.2.0.tar.gz + filename: archive.tar.gz + checksum: "sha256:69aafdd7dcf13ceaa0621be9341bba4a70ea635ef1a2578abc0ce7847e7ddc70" From 5c8866617e90f0c879f062bb5bc0f4693e4f66ea Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Fri, 7 Feb 2025 11:40:17 +0100 Subject: [PATCH 3/3] Drop Containerfile This is not the actual Containerfile that is used during integration test runs, these are still hosted in the main cachi2 repo. Drop this one to avoid confusion. Note that a Containerfile will be added in the future as part of a larger Containerfile migration to the respective test branches. Signed-off-by: Erik Skultety --- Containerfile | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 Containerfile diff --git a/Containerfile b/Containerfile deleted file mode 100644 index b0a96f8..0000000 --- a/Containerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM registry.fedoraproject.org/fedora:40 - -RUN cp -r /tmp/generic_e2e-output/deps/generic/ /deps - -CMD ["ls", "-al", "/deps"] \ No newline at end of file