From 6a524107cbc00e32554dbc4a68d9577f98cdd379 Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Tue, 15 Jul 2025 16:50:25 +0530 Subject: [PATCH 1/9] Remove dependency from rpm package Signed-off-by: Mayank Sachan --- .github/workflows/release.yml | 12 ++++++------ cos-csi-mounter/Makefile | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44819f87..91d6ea05 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - rpm-pkg + - ms-rpm-fix jobs: release: @@ -16,8 +16,8 @@ jobs: - cos-csi-mounter env: - IS_LATEST_RELEASE: 'true' - APP_VERSION: 1.0.1 + IS_LATEST_RELEASE: 'false' + APP_VERSION: 0.5.5 steps: - name: Checkout Code @@ -34,7 +34,7 @@ jobs: - name: Run Unit Tests for cos csi mounter run: sudo make ut-coverage -C ${{ matrix.package_dir }} - - name: Build Debian and RPM Packagesfor cos csi mounter container + - name: Build Debian and RPM packages for cos-csi-mounter systemd service run: | cd ${{ matrix.package_dir }} make packages @@ -63,8 +63,8 @@ jobs: /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256 /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256 - tag_name: v0.5.4 - name: v0.5.4 + tag_name: v0.5.5 + name: v0.5.5 body: Generate debian and rpm packages prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }} diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index 52d17326..f89adcf4 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -1,5 +1,5 @@ NAME := cos-csi-mounter -APP_VERSION := 1.0.1 +APP_VERSION := 0.5.5 BUILD_DIR := $(NAME)-$(APP_VERSION) BIN_DIR := bin @@ -65,7 +65,6 @@ rpm-build: build-linux echo "Summary: $(DESCRIPTION)" >> $(REDHAT_SPEC) echo "License: $(LICENSE)" >> $(REDHAT_SPEC) echo "BuildArch: $(RPM_ARCH)" >> $(REDHAT_SPEC) - echo "Requires: mount.ibmshare = 0.1.1" >> $(REDHAT_SPEC) echo "%define _rpmfilename $(NAME)-$(APP_VERSION).rpm" >> $(REDHAT_SPEC) echo "%build" >> $(REDHAT_SPEC) @@ -77,7 +76,7 @@ rpm-build: build-linux echo "cp -r %{_sourcedir}/* %{buildroot}/" >> $(REDHAT_SPEC) echo "%description" >> $(REDHAT_SPEC) - echo "This package provides the IBM Mount Share helper container service." + echo "This package provides the COS CSI Mounter service." echo "%files" >> $(REDHAT_SPEC) echo "/etc/systemd/system/cos-csi-mounter.service" >> $(REDHAT_SPEC) From cee56f35a35170e282cbec3049c06da73a4ad2ca Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Tue, 15 Jul 2025 16:53:31 +0530 Subject: [PATCH 2/9] Update package version Signed-off-by: Mayank Sachan --- .github/workflows/release.yml | 6 +++--- cos-csi-mounter/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91d6ea05..9cc90f0c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: env: IS_LATEST_RELEASE: 'false' - APP_VERSION: 0.5.5 + APP_VERSION: 0.6.1 steps: - name: Checkout Code @@ -63,8 +63,8 @@ jobs: /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256 /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256 - tag_name: v0.5.5 - name: v0.5.5 + tag_name: v0.6.1 + name: v0.6.1 body: Generate debian and rpm packages prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }} diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index f89adcf4..877a42b8 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -1,5 +1,5 @@ NAME := cos-csi-mounter -APP_VERSION := 0.5.5 +APP_VERSION := 0.6.1 BUILD_DIR := $(NAME)-$(APP_VERSION) BIN_DIR := bin From 96437879323497064b6f30c104a2280a14606667 Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Tue, 15 Jul 2025 16:58:27 +0530 Subject: [PATCH 3/9] publish v0.6.1 Signed-off-by: Mayank Sachan From 4c7b951becb2304bf8fe998fc58ad168a990908b Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Tue, 15 Jul 2025 17:23:03 +0530 Subject: [PATCH 4/9] publish v0.6.1 Signed-off-by: Mayank Sachan --- cos-csi-mounter/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index 877a42b8..db840908 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -62,10 +62,9 @@ rpm-build: build-linux echo "Name: $(NAME)" > $(REDHAT_SPEC) echo "Version: $(APP_VERSION)" >> $(REDHAT_SPEC) echo "Release: $(RPM_RELEASE_NUM)" >> $(REDHAT_SPEC) - echo "Summary: $(DESCRIPTION)" >> $(REDHAT_SPEC) - echo "License: $(LICENSE)" >> $(REDHAT_SPEC) + echo 'Summary: $(DESCRIPTION)' >> $(REDHAT_SPEC) + echo 'License: $(LICENSE)' >> $(REDHAT_SPEC) echo "BuildArch: $(RPM_ARCH)" >> $(REDHAT_SPEC) - echo "%define _rpmfilename $(NAME)-$(APP_VERSION).rpm" >> $(REDHAT_SPEC) echo "%build" >> $(REDHAT_SPEC) echo "%install" >> $(REDHAT_SPEC) @@ -76,7 +75,7 @@ rpm-build: build-linux echo "cp -r %{_sourcedir}/* %{buildroot}/" >> $(REDHAT_SPEC) echo "%description" >> $(REDHAT_SPEC) - echo "This package provides the COS CSI Mounter service." + echo "This package provides the COS CSI Mounter service." >> $(REDHAT_SPEC) echo "%files" >> $(REDHAT_SPEC) echo "/etc/systemd/system/cos-csi-mounter.service" >> $(REDHAT_SPEC) From ab4ee3022bd847a3e4f5b93a620f96146e275ec3 Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Tue, 15 Jul 2025 18:15:19 +0530 Subject: [PATCH 5/9] publish v0.6.2 Signed-off-by: Mayank Sachan --- .github/workflows/release.yml | 6 +++--- cos-csi-mounter/Makefile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cc90f0c..c9b9461b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: env: IS_LATEST_RELEASE: 'false' - APP_VERSION: 0.6.1 + APP_VERSION: 0.6.2 steps: - name: Checkout Code @@ -63,8 +63,8 @@ jobs: /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256 /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256 - tag_name: v0.6.1 - name: v0.6.1 + tag_name: v0.6.2 + name: v0.6.2 body: Generate debian and rpm packages prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }} diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index db840908..382c4655 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -1,5 +1,5 @@ NAME := cos-csi-mounter -APP_VERSION := 0.6.1 +APP_VERSION := 0.6.2 BUILD_DIR := $(NAME)-$(APP_VERSION) BIN_DIR := bin @@ -65,6 +65,7 @@ rpm-build: build-linux echo 'Summary: $(DESCRIPTION)' >> $(REDHAT_SPEC) echo 'License: $(LICENSE)' >> $(REDHAT_SPEC) echo "BuildArch: $(RPM_ARCH)" >> $(REDHAT_SPEC) + echo "%define _rpmfilename $(NAME)-$(APP_VERSION).rpm" >> $(REDHAT_SPEC) echo "%build" >> $(REDHAT_SPEC) echo "%install" >> $(REDHAT_SPEC) From b03ce902461e828d2b78d7877b73c6fefb105521 Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Wed, 16 Jul 2025 10:59:03 +0530 Subject: [PATCH 6/9] publish v0.6.2 and print files of rpm packages Signed-off-by: Mayank Sachan --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9b9461b..dd605e4b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,7 @@ jobs: run: | cd ${{ matrix.package_dir }} make packages + rpm -qlp cos-csi-mounter-${{ env.APP_VERSION }}.rpm - name: Get last commit message id: check_commit From 069dd6da560ee81ea18cfa6c0c82021c53ebe7ef Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Wed, 16 Jul 2025 11:07:49 +0530 Subject: [PATCH 7/9] publish v0.6.2 and print files of rpm packages Signed-off-by: Mayank Sachan --- .github/workflows/release.yml | 1 - cos-csi-mounter/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd605e4b..c9b9461b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,6 @@ jobs: run: | cd ${{ matrix.package_dir }} make packages - rpm -qlp cos-csi-mounter-${{ env.APP_VERSION }}.rpm - name: Get last commit message id: check_commit diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index 382c4655..139ed674 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -105,6 +105,7 @@ tar-package: sha256sum $(INSTALL_TAR_FILE_DEB) > $(CHECKSUM_FILE_DEB) sha256sum $(INSTALL_TAR_FILE_RPM) > $(CHECKSUM_FILE_RPM) @printf "Production - Install package created ok: $(INSTALL_TAR_FILE_DEB) and $(INSTALL_TAR_FILE_RPM)\n" + rpm -qlp cos-csi-mounter-$(APP_VERSION).rpm clean: rm -rf ${BIN_DIR} From 2df6a04347819f3d0200c2c095b5536c38f5445e Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Wed, 16 Jul 2025 11:12:17 +0530 Subject: [PATCH 8/9] publish v0.6.3 and dsiable uild-id symlinks Signed-off-by: Mayank Sachan --- .github/workflows/release.yml | 6 +++--- cos-csi-mounter/Makefile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c9b9461b..d04d0e37 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: env: IS_LATEST_RELEASE: 'false' - APP_VERSION: 0.6.2 + APP_VERSION: 0.6.3 steps: - name: Checkout Code @@ -63,8 +63,8 @@ jobs: /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256 /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256 - tag_name: v0.6.2 - name: v0.6.2 + tag_name: v0.6.3 + name: v0.6.3 body: Generate debian and rpm packages prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }} diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index 139ed674..3ee938f7 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -1,5 +1,5 @@ NAME := cos-csi-mounter -APP_VERSION := 0.6.2 +APP_VERSION := 0.6.3 BUILD_DIR := $(NAME)-$(APP_VERSION) BIN_DIR := bin @@ -65,6 +65,7 @@ rpm-build: build-linux echo 'Summary: $(DESCRIPTION)' >> $(REDHAT_SPEC) echo 'License: $(LICENSE)' >> $(REDHAT_SPEC) echo "BuildArch: $(RPM_ARCH)" >> $(REDHAT_SPEC) + echo "%global _build_id_links none" >> $(REDHAT_SPEC) echo "%define _rpmfilename $(NAME)-$(APP_VERSION).rpm" >> $(REDHAT_SPEC) echo "%build" >> $(REDHAT_SPEC) From 47d6c5104b7380e3a52aba424614d2a3252c7ec8 Mon Sep 17 00:00:00 2001 From: Mayank Sachan Date: Thu, 17 Jul 2025 18:42:37 +0530 Subject: [PATCH 9/9] revert package version Signed-off-by: Mayank Sachan --- .github/workflows/release.yml | 8 ++++---- cos-csi-mounter/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d04d0e37..c330b1b1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - ms-rpm-fix + - main jobs: release: @@ -17,7 +17,7 @@ jobs: env: IS_LATEST_RELEASE: 'false' - APP_VERSION: 0.6.3 + APP_VERSION: 1.0.1 steps: - name: Checkout Code @@ -63,8 +63,8 @@ jobs: /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256 /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256 - tag_name: v0.6.3 - name: v0.6.3 + tag_name: v1.0.1 + name: v1.0.1 body: Generate debian and rpm packages prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }} diff --git a/cos-csi-mounter/Makefile b/cos-csi-mounter/Makefile index 3ee938f7..ccfa779f 100644 --- a/cos-csi-mounter/Makefile +++ b/cos-csi-mounter/Makefile @@ -1,5 +1,5 @@ NAME := cos-csi-mounter -APP_VERSION := 0.6.3 +APP_VERSION := 1.0.1 BUILD_DIR := $(NAME)-$(APP_VERSION) BIN_DIR := bin @@ -114,4 +114,4 @@ clean: rm -rf packages packages: -packages: deb-build rpm-build tar-package clean \ No newline at end of file +packages: deb-build rpm-build tar-package clean