From 7e3bcb6810c608b3270633ca4f16db5f463ecff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 21 Nov 2023 10:52:09 +0100 Subject: [PATCH 1/5] include old client config for eessi-hpc.org --- .github/workflows/build-test-release-client-packages.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-test-release-client-packages.yml b/.github/workflows/build-test-release-client-packages.yml index 856c3d60..43b17229 100644 --- a/.github/workflows/build-test-release-client-packages.yml +++ b/.github/workflows/build-test-release-client-packages.yml @@ -36,6 +36,11 @@ jobs: echo "localhost ansible_connection=local" > inventory/hosts ansible-playbook ./prepare-client-packages.yml + - name: Include the old eessi-hpc.org config as well for now + run: | + wget https://github.com/EESSI/filesystem-layer/releases/download/v0.4.0/cvmfs-config-eessi-0.4.0.tar + tar xf cvmfs-config-eessi-0.4.0.tar + # We probably should loop over the set {rpm,deb,osxpkg} to create packages, but # it will make debugging more annoying. From 632ff08acc52d7585ce83513f9163315341de534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 21 Nov 2023 11:56:14 +0100 Subject: [PATCH 2/5] remove tarball after extraction --- .github/workflows/build-test-release-client-packages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-test-release-client-packages.yml b/.github/workflows/build-test-release-client-packages.yml index 43b17229..c91f7190 100644 --- a/.github/workflows/build-test-release-client-packages.yml +++ b/.github/workflows/build-test-release-client-packages.yml @@ -40,6 +40,7 @@ jobs: run: | wget https://github.com/EESSI/filesystem-layer/releases/download/v0.4.0/cvmfs-config-eessi-0.4.0.tar tar xf cvmfs-config-eessi-0.4.0.tar + rm cvmfs-config-eessi-0.4.0.tar # We probably should loop over the set {rpm,deb,osxpkg} to create packages, but # it will make debugging more annoying. From e232d01539d4b1ff5f314d0a52c80992092b4740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 21 Nov 2023 12:02:15 +0100 Subject: [PATCH 3/5] extract to package subdir --- .github/workflows/build-test-release-client-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-release-client-packages.yml b/.github/workflows/build-test-release-client-packages.yml index c91f7190..f44c93dd 100644 --- a/.github/workflows/build-test-release-client-packages.yml +++ b/.github/workflows/build-test-release-client-packages.yml @@ -39,7 +39,7 @@ jobs: - name: Include the old eessi-hpc.org config as well for now run: | wget https://github.com/EESSI/filesystem-layer/releases/download/v0.4.0/cvmfs-config-eessi-0.4.0.tar - tar xf cvmfs-config-eessi-0.4.0.tar + tar -C ./package -xf cvmfs-config-eessi-0.4.0.tar rm cvmfs-config-eessi-0.4.0.tar # We probably should loop over the set {rpm,deb,osxpkg} to create packages, but From 40a1a040f18e6cdf786b7b5ba2d9e9fd8374a951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 21 Nov 2023 12:06:51 +0100 Subject: [PATCH 4/5] use cvmfs-config-none for tests, to prevent it from picking up eessi configuration from the cern config repo --- .github/workflows/build-test-release-client-packages.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-release-client-packages.yml b/.github/workflows/build-test-release-client-packages.yml index f44c93dd..5643a0fc 100644 --- a/.github/workflows/build-test-release-client-packages.yml +++ b/.github/workflows/build-test-release-client-packages.yml @@ -129,7 +129,7 @@ jobs: run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb && sudo dpkg -i cvmfs-release-latest_all.deb - name: Install CVMFS client - run: sudo apt-get update && sudo apt-get install cvmfs + run: sudo apt-get update && sudo apt-get install cvmfs cvmfs-config-none - name: Download cvmfs-config-eessi package uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1 @@ -167,7 +167,7 @@ jobs: run: yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm - name: Install CVMFS client - run: yum install -y cvmfs + run: yum install -y cvmfs cvmfs-config-none - name: Download cvmfs-config-eessi package uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1 @@ -205,7 +205,7 @@ jobs: run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb && sudo dpkg -i cvmfs-release-latest_all.deb - name: Install CVMFS client - run: sudo apt-get update && sudo apt-get install cvmfs + run: sudo apt-get update && sudo apt-get install cvmfs cvmfs-config-none - name: Download cvmfs-config-eessi package uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1 From 6029c48cb49f3cc00b3ded878eca7fdc941c45fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 21 Nov 2023 12:20:39 +0100 Subject: [PATCH 5/5] manually download cvmfs-config-none on debian systems, use repo for EL --- .../workflows/build-test-release-client-packages.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test-release-client-packages.yml b/.github/workflows/build-test-release-client-packages.yml index 5643a0fc..a12d6eb7 100644 --- a/.github/workflows/build-test-release-client-packages.yml +++ b/.github/workflows/build-test-release-client-packages.yml @@ -128,8 +128,11 @@ jobs: - name: Download and install CVMFS client run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb && sudo dpkg -i cvmfs-release-latest_all.deb + - name: Download and install cvmfs-config-none package + run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-none_1.1-0_all.deb && sudo dpkg -i cvmfs-config-none_1.1-0_all.deb + - name: Install CVMFS client - run: sudo apt-get update && sudo apt-get install cvmfs cvmfs-config-none + run: sudo apt-get update && sudo apt-get install cvmfs - name: Download cvmfs-config-eessi package uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1 @@ -164,7 +167,7 @@ jobs: steps: - name: Download and install CVMFS client - run: yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm + run: yum install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm && yum-config-manager --enable cernvm-config - name: Install CVMFS client run: yum install -y cvmfs cvmfs-config-none @@ -204,8 +207,11 @@ jobs: - name: Download and install CVMFS client run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb && sudo dpkg -i cvmfs-release-latest_all.deb + - name: Download and install cvmfs-config-none package + run: wget https://ecsft.cern.ch/dist/cvmfs/cvmfs-config/cvmfs-config-none_1.1-0_all.deb && sudo dpkg -i cvmfs-config-none_1.1-0_all.deb + - name: Install CVMFS client - run: sudo apt-get update && sudo apt-get install cvmfs cvmfs-config-none + run: sudo apt-get update && sudo apt-get install cvmfs - name: Download cvmfs-config-eessi package uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1