Merge pull request #1356 from maticnetwork/djpolygon/rpm_updates

Changing names of pbss profiles for consistency in deb and rpm
maticnetwork · Oct 16, 2024 · 4ebe634 · 4ebe634
2 parents 19ab472 + 27a626d
commit 4ebe634
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 108 deletions.
diff --git a/.github/workflows/rpm_amoy_profile_packager.yml b/.github/workflows/rpm_amoy_profile_packager.yml
@@ -83,32 +83,32 @@ jobs:
 
       - name: Setting up Amoy Sentry PBSS Node Spec files
         run: |
-          touch packaging/rpm/bor-amoy-sentry-pbss.spec 
-          echo "Name: bor-amoy-sentry-pbss-config" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "Version: ${{ env.GIT_TAG1 }}" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "Release: 1%{?dist}" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "License: GPL/AGPL" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "BuildArch: noarch" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "Summary: bor amoy sentry config rpm package" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-
-          echo "%description" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "Bor Amoy Sentry rpm package" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
+          touch packaging/rpm/bor-pbss-amoy-sentry.spec 
+          echo "Name: bor-pbss-amoy-sentry-config" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "Version: ${{ env.GIT_TAG1 }}" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "Release: 1%{?dist}" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "License: GPL/AGPL" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "BuildArch: noarch" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "Summary: bor amoy sentry config rpm package" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+
+          echo "%description" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "Bor Amoy Sentry rpm package" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
           
-          echo "" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "%pre" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "%install" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "mkdir -p %{buildroot}/var/lib/bor" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "cp /home/runner/work/bor/bor/packaging/templates/testnet-amoy/sentry/sentry/bor/pbss_config.toml %{buildroot}/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "mkdir -p %{buildroot}/lib/systemd/system" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "cp /home/runner/work/bor/bor/packaging/templates/systemd/bor.service %{buildroot}/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
+          echo "" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "%pre" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "%install" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "mkdir -p %{buildroot}/var/lib/bor" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "cp /home/runner/work/bor/bor/packaging/templates/testnet-amoy/sentry/sentry/bor/pbss_config.toml %{buildroot}/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "mkdir -p %{buildroot}/lib/systemd/system" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "cp /home/runner/work/bor/bor/packaging/templates/systemd/bor.service %{buildroot}/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
           
-          echo "%files" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "%attr(0755, bor, bor) /var/lib/bor" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "%post" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
-          echo "/bin/systemctl daemon-reload" >> packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec
+          echo "%files" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "%attr(0755, bor, bor) /var/lib/bor" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "%post" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
+          echo "/bin/systemctl daemon-reload" >> packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec
 
       - name: Build Amoy Sentry PBSS Node profile RPM
         run: |
@@ -117,7 +117,7 @@ jobs:
            --define "_rpmdir %{_topdir}/RPMS" \
            --define "_srcrpmdir %{_topdir}/SRPMS" \
            --define "__spec_install_post /bin/true" \
-           -bb packaging/rpm/SPECS/bor-amoy-sentry-pbss.spec 
+           -bb packaging/rpm/SPECS/bor-pbss-amoy-sentry.spec 
 
       - name: Setting up Amoy Validator Node node
         run: echo "#########################################################################"
@@ -166,32 +166,32 @@ jobs:
 
       - name: Setting up Amoy Validator PBSS Node Spec files
         run: |
-          touch packaging/rpm/bor-amoy-validator-pbss.spec 
-          echo "Name: bor-amoy-validator-pbss-config" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "Version: ${{ env.GIT_TAG1 }}" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "Release: 1%{?dist}" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "License: GPL/AGPL" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "BuildArch: noarch" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "Summary: bor amoy validator config rpm package" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-
-          echo "%description" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "Bor Amoy Validator rpm package" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
+          touch packaging/rpm/bor-pbss-amoy-validator.spec 
+          echo "Name: bor-pbss-amoy-validator-config" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "Version: ${{ env.GIT_TAG1 }}" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "Release: 1%{?dist}" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "License: GPL/AGPL" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "BuildArch: noarch" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "Summary: bor amoy validator config rpm package" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+
+          echo "%description" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "Bor Amoy Validator rpm package" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
           
-          echo "" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "%pre" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "%install" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "mkdir -p %{buildroot}/var/lib/bor" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "cp /home/runner/work/bor/bor/packaging/templates/testnet-amoy/sentry/validator/bor/pbss_config.toml %{buildroot}/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "mkdir -p %{buildroot}/lib/systemd/system" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "cp /home/runner/work/bor/bor/packaging/templates/systemd/bor.service %{buildroot}/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
+          echo "" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "%pre" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "%install" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "mkdir -p %{buildroot}/var/lib/bor" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "cp /home/runner/work/bor/bor/packaging/templates/testnet-amoy/sentry/validator/bor/pbss_config.toml %{buildroot}/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "mkdir -p %{buildroot}/lib/systemd/system" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "cp /home/runner/work/bor/bor/packaging/templates/systemd/bor.service %{buildroot}/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
           
-          echo "%files" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "%attr(0755, bor, bor) /var/lib/bor" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "%post" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
-          echo "/bin/systemctl daemon-reload" >> packaging/rpm/SPECS/bor-amoy-validator-pbss.spec
+          echo "%files" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "/var/lib/bor/config.toml" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "/lib/systemd/system/bor.service" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "%attr(0755, bor, bor) /var/lib/bor" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "%post" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
+          echo "/bin/systemctl daemon-reload" >> packaging/rpm/SPECS/bor-pbss-amoy-validator.spec
 
 
       - name: Build Amoy Validator PBSS Node profile RPM
@@ -201,7 +201,7 @@ jobs:
            --define "_rpmdir %{_topdir}/RPMS" \
            --define "_srcrpmdir %{_topdir}/SRPMS" \
            --define "__spec_install_post /bin/true" \
-           -bb packaging/rpm/SPECS/bor-amoy-validator-pbss.spec   
+           -bb packaging/rpm/SPECS/bor-pbss-amoy-validator.spec   
 
 
       - name: Setting up Amoy Boot node
@@ -293,11 +293,11 @@ jobs:
       - name: renaming file for rpm release appendage sentry amoy
         run: mv /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-sentry-config-${{ env.GIT_TAG1 }}-1.noarch.rpm /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-sentry-config-${{ env.GIT_TAG1 }}.noarch.rpm
       - name: renaming file for rpm release appendage sentry pbss amoy
-        run: mv /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-sentry-pbss-config-${{ env.GIT_TAG1 }}-1.noarch.rpm /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-sentry-pbss-config-${{ env.GIT_TAG1 }}.noarch.rpm
+        run: mv /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-pbss-amoy-sentry-config-${{ env.GIT_TAG1 }}-1.noarch.rpm /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-pbss-amoy-sentry-config-${{ env.GIT_TAG1 }}.noarch.rpm
       - name: renaming file for rpm release appendage validator amoy
         run: mv /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-validator-config-${{ env.GIT_TAG1 }}-1.noarch.rpm /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-validator-config-${{ env.GIT_TAG1 }}.noarch.rpm
       - name: renaming file for rpm release appendage validator pbss amoy
-        run: mv /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-validator-pbss-config-${{ env.GIT_TAG1 }}-1.noarch.rpm /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-validator-pbss-config-${{ env.GIT_TAG1 }}.noarch.rpm
+        run: mv /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-pbss-amoy-validator-config-${{ env.GIT_TAG1 }}-1.noarch.rpm /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-pbss-amoy-validator-config-${{ env.GIT_TAG1 }}.noarch.rpm
 
       - name: adding shasum for the rpm build amoy archive
         run: cd /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/ && sha256sum bor-amoy-archive-config-${{ env.GIT_TAG1 }}.noarch.rpm > /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-archive-config-${{ env.GIT_TAG1 }}.noarch.rpm.checksum
@@ -306,11 +306,11 @@ jobs:
       - name: adding shasum for the rpm build amoy sentry
         run: cd /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/ && sha256sum bor-amoy-sentry-config-${{ env.GIT_TAG1 }}.noarch.rpm > /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-sentry-config-${{ env.GIT_TAG1 }}.noarch.rpm.checksum
       - name: adding shasum for the rpm build amoy sentry pbss
-        run: cd /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/ && sha256sum bor-amoy-sentry-pbss-config-${{ env.GIT_TAG1 }}.noarch.rpm > /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-sentry-pbss-config-${{ env.GIT_TAG1 }}.noarch.rpm.checksum
+        run: cd /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/ && sha256sum bor-pbss-amoy-sentry-config-${{ env.GIT_TAG1 }}.noarch.rpm > /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-pbss-amoy-sentry-config-${{ env.GIT_TAG1 }}.noarch.rpm.checksum
       - name: adding shasum for the rpm build amoy validator
         run: cd /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/ && sha256sum bor-amoy-validator-config-${{ env.GIT_TAG1 }}.noarch.rpm > /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-validator-config-${{ env.GIT_TAG1 }}.noarch.rpm.checksum
       - name: adding shasum for the rpm build amoy validator pbss
-        run: cd /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/ && sha256sum bor-amoy-validator-pbss-config-${{ env.GIT_TAG1 }}.noarch.rpm > /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-amoy-validator-pbss-config-${{ env.GIT_TAG1 }}.noarch.rpm.checksum
+        run: cd /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/ && sha256sum bor-pbss-amoy-validator-config-${{ env.GIT_TAG1 }}.noarch.rpm > /home/runner/work/bor/bor/packaging/rpm_build/RPMS/noarch/bor-pbss-amoy-validator-config-${{ env.GIT_TAG1 }}.noarch.rpm.checksum
 
 
       - name: Release bor Packages