build from main (test)

.werf/consts.yaml

@@ -9,7 +9,12 @@
 
 # component versions
 {{- $versions := dict }}
-{{- $_ := set $versions "DRBD" "9.2.12" }}
+# if you build from the main one then "DRBD" "X.Y.Z-n"
+#   X.Y.Z - echo $(sed -ne '/^\#define REL_VERSION/{s/^[^"]*"\([^ "]*\).*/\1/;p;q;}' DRBD_SRC/drbd/linux/drbd_config.h)
+#   n = n + 1
+{{- $_ := set $versions "DRBD" "9.3.0-1" }}
+# empty if the assembly is not from the main
+{{- $_ := set $versions "DRBD_COMMIT_REF" "53fe7073c53951849a997e7bf1b5f39eea1fb28f" }}
 {{- $_ := set $versions "DRBD_REACTOR" "1.8.0" }}
 {{- $_ := set $versions "DRBD_UTILS" "9.30.0" }}
 {{- $_ := set $versions "LINSTOR_AFFINITY_CONTROLLER" "0.3.0" }}

images/drbd/werf.inc.yaml

@@ -27,15 +27,46 @@ shell:
     - chmod +x /install
     - chmod +x /uninstall
   setup:
-    - git clone --depth 1 --branch drbd-{{ $.Versions.DRBD }} {{ $.Root.SOURCE_REPO }}/LINBIT/drbd.git  /drbd
+    - git clone {{ $.Root.SOURCE_REPO }}/LINBIT/drbd.git /drbd
     - cd /drbd
+    - |
+      drbd_commit_hash=1234567
+      if grep -qP '^\w{40}$' <<< {{ $.Versions.DRBD_COMMIT_REF }} ;then
+        # build from main
+        drbd_commit_hash={{ $.Versions.DRBD_COMMIT_REF }}
+        git reset --hard $drbd_commit_hash
+
+        ### see "check check_changelogs_up2date:" in Makefile
+        dver={{ $.Versions.DRBD }}
+        packagever=$(sed 's/-/~/' <<< {{ $.Versions.DRBD }})
+        for f in drbd-kernel.spec; do
+          sed -i "s/^Version: .*/Version: $packagever/" $f
+          echo "- $packagever" >> $f
+        done
+        #
+        last_actual_version=$(git describe --tags --abbrev=0 | sed 's/drbd-//')
+        sed -i "s/$last_actual_version/{{ $.Versions.DRBD }}/g" ChangeLog
+        #
+        for df in 7 8 9; do
+          sed -i "s/^ENV DRBD_VERSION .*/ENV DRBD_VERSION $dver/" docker/Dockerfile.rhel${df}
+        done
+        #
+        echo "drbd ($packagever)" >> debian/changelog
+
+        sed -i "s|^\#define REL_VERSION .*|\#define REL_VERSION \"{{ $.Versions.DRBD }}\"|" drbd/linux/drbd_config.h
+        git commit -am 'bump drbd version'
+      else
+        git reset --hard drbd-{{ $.Versions.DRBD }}
+      fi
     - git submodule update --init --recursive
     - sed -e "s/\<curl\>/d8-curl -k/g" -i /drbd/drbd/drbd-kernel-compat/gen_compat_patch.sh
     - git commit -am 'd8-curl'
       # tarball required by spaas image
     - make tarball
       # disable use of local spatch (see /drbd/drbd/drbd-kernel-compat/gen_compat_patch.sh)
     - rm -rf .git
+      # save actual commit
+    - echo "GIT-hash:$drbd_commit_hash" > drbd/.drbd_git_revision
 ---
 image: {{ $.ImageName }}
 from: {{ $.Root.BASE_SCRATCH }}

openapi/values.yaml

@@ -15,7 +15,7 @@ properties:
     properties:
       drbdVersion:
         type: string
-        default: "9.2.12"
+        default: "9.3.0-1"
       dataNodesChecksum:
         type: string
         default: "default_data_nodes_checksum"

templates/linstor-node/daemonset.yaml

@@ -88,12 +88,12 @@ spec:
             - /linstor-drbd-wait
           env:
             - name: FILE_CONTENT
-              value: "version: 9.2"
+              value: "version: 9.3"
             - name: WAITING_MSG
-              value: "Waiting for DRBD version 9.2.x on host"
+              value: "Waiting for DRBD version 9.3.x on host"
           image: {{ include "helm_lib_module_image" (list . "linstorDrbdWait") }}
           imagePullPolicy: IfNotPresent
-          name: wait-drbd-ver-9-2
+          name: wait-drbd-ver-9-3
           resources:
             requests:
               {{- include "helm_lib_module_ephemeral_storage_only_logs" . | nindent 14 }}