Daemon RPM build rework

.github/workflows/rpm_build.yml

@@ -1,73 +1,53 @@
+# Testing with nektos/act:
+#   $ act --rm -j rpm_build --container-architecture linux/amd64 --pull=false --bind push
+#
+
+
 name: RPM Build
 on:
   push:
     branches:
       - '*'
-    tags:
-      - 'v*'
 
 jobs:
-  repo_version:
-    runs-on: ubuntu-latest
-    outputs:
-      version_output: ${{ steps.step1.outputs.version }}
-    steps:
-      - name: Verify context
-        run: |
-          echo "ref is ${{ github.ref }}"
-          echo "ref_type is ${{ github.ref_type }}"
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Get Version
-        id: step1
-        run: echo "version=$(./git-version-gen)" >> $GITHUB_OUTPUT
-
   rpm_build:
     runs-on: ubuntu-latest
-    needs: repo_version
-    container:
-      image: centos:8
-      env:
-        NODE_ENV: development
-      ports:
-        - 80
-      options: --cpus 1
     steps:
-      - name: "Build context"
-        env:
-          VERSION_OUTPUT: ${{ needs.repo_version.outputs.version_output }}
-        run: |
-          echo "ref is ${{ github.ref }}"
-          echo "ref_type is ${{ github.ref_type }}"
-          echo "head.sha is ${{ github.event.pull_request.head.sha }}"
-          echo "git-version-gen is $VERSION_OUTPUT"
+    - name: checkout
+      if: ${{ !env.ACT }} # skip during local actions testing
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        ref: ${{ github.event.pull_request.head.sha }}
+
+    - name: context
+      run: |
+        echo "ref is ${{ github.ref }}"
+        echo "ref_type is ${{ github.ref_type }}"
+        echo "head.sha is ${{ github.event.pull_request.head.sha }}"
+        echo "git-version-gen: $(./git-version-gen)"
+        echo "want go version: $(grep -E '^go ' go.mod)"
+
+    - name: setup go
+      # This is needed only because the 'make build-daemon' target will run
+      # the 'go fmt' and 'go vet' commands before it starts the docker build.
+      if: ${{ env.ACT }} # use during local actions testing
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: 'go.mod'
+
+    - name: build rpms
+      run: |
+         go version
+         pwd
+         make build-daemon-rpm
+         /bin/ls -al rpms
+
+    - name: upload rpms
+      if: ${{ !env.ACT }} # skip during local actions testing
+      uses: actions/upload-artifact@v4
+      with:
+         name: nnf-dm.rpm
+         path: /home/runner/work/nnf-dm/nnf-dm/rpms/*
+         if-no-files-found: error
 
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: environment setup
-        env:
-          VERSION_OUTPUT: ${{ needs.repo_version.outputs.version_output }}
-        run: |
-          dnf -y --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos
-          dnf -y distro-sync
-          dnf -y makecache --refresh
-          dnf install -y rpm-build rpmdevtools git make
-          dnf module -y install go-toolset 
-          rpmdev-setuptree
-          echo $VERSION_OUTPUT > .rpmversion
-          cat .rpmversion
-          tar -czf /github/home/rpmbuild/SOURCES/nnf-datamovement-1.0.tar.gz --transform 's,^,nnf-datamovement-1.0/,' .
-      - name: build rpms
-        run: rpmbuild -ba daemons/compute/server/nnf-dm.spec
-      - name: upload rpms
-        uses: actions/upload-artifact@v3
-        with:
-          name: nnf-datamovement-1.0-1.el8.x86_64.rpm
-          path: /github/home/rpmbuild/RPMS/x86_64/nnf-datamovement-1.0-1.el8.x86_64.rpm
-      - name: upload srpms
-        uses: actions/upload-artifact@v3
-        with:
-          name: nnf-datamovement-1.0-1.el8.src.rpm
-          path: /github/home/rpmbuild/SRPMS/nnf-datamovement-1.0-1.el8.src.rpm

.gitignore

@@ -10,6 +10,7 @@ testbin/*
 nnf-dm
 .version
 config/begin/*
+rpms/
 
 # Test binary, build with `go test -c`
 *.test

Dockerfile.rpmbuild

@@ -0,0 +1,76 @@
+# Copyright 2024 Hewlett Packard Enterprise Development LP
+# Other additional copyright holders may be indicated within.
+#
+# The entirety of this work is licensed under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+#
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM --platform=$BUILDPLATFORM golang:1.19 AS gobuilder
+
+ARG TARGETARCH
+ARG TARGETOS
+ARG RPMVERSION
+
+ARG PACKAGE_VERSION="github.com/NearNodeFlash/nnf-dm/daemons/compute/server/version"
+
+WORKDIR /workspace
+
+# Copy the Go Modules manifests
+COPY go.mod go.mod
+COPY go.sum go.sum
+
+# Copy the go source
+COPY daemons/compute/server/ daemons/compute/server/
+COPY daemons/compute/client-go/api/ daemons/compute/client-go/api/
+COPY api/ api/
+COPY internal/ internal/
+COPY vendor/ vendor/
+
+# Build
+# the GOARCH has a default value to allow the binary be built according to the host where the command
+# was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
+# the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
+# by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
+
+RUN mkdir /artifacts && \
+    CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -ldflags="-X '$PACKAGE_VERSION.version=$RPMVERSION'" -a -o /artifacts/nnf-dm daemons/compute/server/main.go && \
+    tar -czf /artifacts/nnf-dm-$RPMVERSION.tar.gz --transform 's,^,nnf-dm-'$RPMVERSION'/,' .
+
+FROM --platform=$BUILDPLATFORM centos:8 AS rpmbuilder
+
+ARG RPMVERSION
+ARG RPMTARGET
+
+# The mkdirs in /root/rpmbuild would normally be done by rpmdev-setuptree.
+# However, we're trying to cut the run time and that drags in a lot of
+# dependencies.
+RUN dnf -y --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos && \
+    dnf -y install rpm-build && \
+    mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES
+
+WORKDIR /workspace
+
+COPY --from=gobuilder /workspace/daemons/compute/server/nnf-dm.spec nnf-dm.spec
+COPY --from=gobuilder /artifacts/* /workspace/
+
+RUN sed -i.bak -e 's/^Version: .*/Version: '$RPMVERSION'/' nnf-dm.spec && \
+    cp nnf-dm-$RPMVERSION.tar.gz /root/rpmbuild/SOURCES/ && \
+    rpmbuild --target=$RPMTARGET -bb nnf-dm.spec && \
+    mkdir /artifacts && \
+    find /root/rpmbuild/RPMS -name '*.rpm' -exec cp {} /artifacts \;
+
+CMD ["/bin/ls", "-al", "/artifacts"]
+
+FROM scratch AS artifacts
+COPY --from=rpmbuilder /artifacts/* /
+

Makefile

@@ -126,11 +126,20 @@ container-unit-test: .version ## Run tests inside a container image
 	${CONTAINER_TOOL} run --rm -t --name $@-nnf-dm  $(IMAGE_TAG_BASE)-$@:$(VERSION)
 
 ##@ Build
-
+RPM_PLATFORM ?= linux/amd64
+RPM_TARGET ?= x86_64
+.PHONY: build-daemon-rpm
+build-daemon-rpm: RPM_VERSION ?= $(shell ./git-version-gen | sed -e 's/\-.*//')
+build-daemon-rpm: $(RPMBIN)
+build-daemon-rpm: fmt vet ## Build standalone nnf-dm binary and its rpm
+	${CONTAINER_TOOL} build --platform=$(RPM_PLATFORM) --build-arg="RPMTARGET=$(RPM_TARGET)" --build-arg="RPMVERSION=$(RPM_VERSION)" --output=type=local,dest=$(RPMBIN) -f Dockerfile.rpmbuild .
+
+.PHONY: build-daemon
 build-daemon: RPM_VERSION ?= $(shell ./git-version-gen)
 build-daemon: PACKAGE = github.com/NearNodeFlash/nnf-dm/daemons/compute/server/version
+build-daemon: $(LOCALBIN)
 build-daemon: manifests generate fmt vet ## Build standalone nnf-datamovement daemon
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X '$(PACKAGE).version=$(RPM_VERSION)'" -o bin/nnf-dm daemons/compute/server/main.go
+	CGO_ENABLED=0 go build -ldflags="-X '$(PACKAGE).version=$(RPM_VERSION)'" -o bin/nnf-dm daemons/compute/server/main.go
 
 build: generate fmt vet ## Build manager binary.
 	CGO_ENABLED=0 go build -o bin/manager cmd/main.go
@@ -211,6 +220,17 @@ clean-bin:
 	  chmod -R u+w $(LOCALBIN) && rm -rf $(LOCALBIN); \
 	fi
 
+## Location to place rpms
+RPMBIN ?= $(shell pwd)/rpms
+$(RPMBIN):
+	mkdir $(RPMBIN)
+
+.PHONY: clean-rpmbin
+clean-rpmbin:
+	if [[ -d $(RPMBIN) ]]; then \
+	  rm -rf $(RPMBIN); \
+	fi
+
 ## Tool Binaries
 KUSTOMIZE_IMAGE_TAG ?= ./hack/make-kustomization2.sh
 KUSTOMIZE ?= $(LOCALBIN)/kustomize

daemons/compute/server/nnf-dm.spec

@@ -1,7 +1,7 @@
 %undefine _missing_build_ids_terminate_build
 %global debug_package %{nil}
 
-Name: nnf-datamovement
+Name: nnf-dm
 Version: 1.0
 Release: 1%{?dist}
 Summary: Near Node Flash data movement daemon
@@ -11,8 +11,6 @@ License: Apache-2.0
 URL: https://github.com/NearNodeFlash/nnf-dm
 Source0: %{name}-%{version}.tar.gz
 
-BuildRequires:	golang
-
 %description
 This package provides the data movement server for Near Node Flash. This allows
 Near Node Flash data movement through the data movement API.
@@ -21,7 +19,8 @@ Near Node Flash data movement through the data movement API.
 %setup -q
 
 %build
-RPM_VERSION=$(cat .rpmversion) make build-daemon
+# The executable was already created by the Dockerfile.
+mkdir bin && cp /workspace/nnf-dm bin
 
 %install
 mkdir -p %{buildroot}/usr/bin/