build: Revert to semi-working syntax

build: Try different syntax (remove quotes)
build: Test different syntax for character escape
2023-06-20 16:30:49 +02:00 · 2023-06-20 15:44:45 +02:00 · 2023-06-20 15:40:39 +02:00 · 2023-06-20 15:37:36 +02:00 · 2023-06-20 15:35:09 +02:00 · 2023-06-20 15:32:53 +02:00
4 changed files with 181 additions and 158 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -10,6 +10,11 @@ volumes:
  claim:
    name: flexvolsmb-drone-scratch

+trigger:
+  event:
+    exclude:
+    - tag
+
 steps:
 - name: Debugging information
  image: bv11-cr01.bessems.eu/library/packer-extended
@ -48,173 +53,179 @@ steps:
    npm install \
      semantic-release \
      @semantic-release/commit-analyzer \
-      @semantic-release/release-notes-generator\
-      @semantic-release/exec
+      @semantic-release/exec \
  - |
    export GIT_CREDENTIALS=$${GIT_USERNAME}:$${GIT_APIKEY}
  - |
    npx semantic-release \
+      --package @semantic-release/exec \
+      --package semantic-release \
      --branches ${DRONE_BRANCH} \
-      --plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator,@semantic-release/exec \
-      --dry-run
+      --tag-format "K8s_1.25.9-v\$${version}" \
+      --dry-run \
+      --plugins @semantic-release/commit-analyzer,@semantic-release/exec \
+      --analyzeCommits @semantic-release/commit-analyzer \
+      --verifyRelease @semantic-release/exec \
+      --verifyReleaseCmd 'echo "$${nextRelease.version}" > .version'
  environment:
    GIT_APIKEY:
      from_secret: git_apikey
    GIT_USERNAME: djpbessems

-# Add random change for testing semantic release commit
+- name: Install Ansible Galaxy collections
+  depends_on:
+  - Semantic Release (Dry-run)
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  pull: always
+  commands:
+  - |
+    ansible-galaxy collection install \
+      -r ansible/requirements.yml \
+      -p ./ansible/collections

-# - name: Install Ansible Galaxy collections
-#   depends_on:
-#   - Semantic Release (Dry-run)
-#   image: bv11-cr01.bessems.eu/library/packer-extended
-#   pull: always
-#   commands:
-#   - |
-#     ansible-galaxy collection install \
-#       -r ansible/requirements.yml \
-#       -p ./ansible/collections
-#   volumes:
-#   - name: scratch
-#     path: /scratch
+- name: Kubernetes Bootstrap Appliance
+  depends_on:
+  - Install Ansible Galaxy collections
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  pull: always
+  commands:
+  - |
+    sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
+      packer/preseed/UbuntuServer22.04/user-data
+  - |
+    export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
+    export NEXT_RELEASE_VERSION=$(cat .version)
+  - |
+    packer init -upgrade \
+      ./packer
+  - |
+    packer validate \
+      -only=vsphere-iso.bootstrap \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
+      -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_password=$${DOCKER_PASSWORD} \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
+      ./packer
+  - |
+    packer build \
+      -on-error=cleanup -timestamp-ui \
+      -only=vsphere-iso.bootstrap \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
+      -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_password=$${DOCKER_PASSWORD} \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
+      ./packer
+  environment:
+    DOCKER_USERNAME:
+      from_secret: docker_username
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    # PACKER_LOG: 1
+    REPO_USERNAME:
+      from_secret: repo_username
+    REPO_PASSWORD:
+      from_secret: repo_password
+    SSH_PASSWORD:
+      from_secret: ssh_password
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+  volumes:
+  - name: output
+    path: /output
+  - name: scratch
+    path: /scratch

-# - name: Kubernetes Bootstrap Appliance
-#   depends_on:
-#   - Install Ansible Galaxy collections
-#   image: bv11-cr01.bessems.eu/library/packer-extended
-#   pull: always
-#   commands:
-#   - |
-#     sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
-#       packer/preseed/UbuntuServer22.04/user-data
-#   - |
-#     export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
-#   - |
-#     packer init -upgrade \
-#       ./packer
-#   - |
-#     packer validate \
-#       -only=vsphere-iso.bootstrap \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
-#       ./packer
-#   - |
-#     packer build \
-#       -on-error=cleanup -timestamp-ui \
-#       -only=vsphere-iso.bootstrap \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
-#       ./packer
-#   environment:
-#     DOCKER_USERNAME:
-#       from_secret: docker_username
-#     DOCKER_PASSWORD:
-#       from_secret: docker_password
-#     # PACKER_LOG: 1
-#     REPO_USERNAME:
-#       from_secret: repo_username
-#     REPO_PASSWORD:
-#       from_secret: repo_password
-#     SSH_PASSWORD:
-#       from_secret: ssh_password
-#     VSPHERE_PASSWORD:
-#       from_secret: vsphere_password
-#   volumes:
-#   - name: output
-#     path: /output
-#   - name: scratch
-#     path: /scratch
+- name: Kubernetes Upgrade Appliance
+  depends_on:
+  - Install Ansible Galaxy collections
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  pull: alwaysquery(
+  commands:
+  - |
+    sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
+      packer/preseed/UbuntuServer22.04/user-data
+  - |
+    export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
+    export NEXT_RELEASE_VERSION=$(cat .version)
+  - |
+    packer init -upgrade \
+      ./packer
+  - |
+    packer validate \
+      -only=vsphere-iso.upgrade \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
+      -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_password=$${DOCKER_PASSWORD} \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
+      ./packer
+  - |
+    packer build \
+      -on-error=cleanup -timestamp-ui \
+      -only=vsphere-iso.upgrade \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
+      -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_password=$${DOCKER_PASSWORD} \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
+      ./packer
+  environment:
+    DOCKER_USERNAME:
+      from_secret: docker_username
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    # PACKER_LOG: 1
+    REPO_USERNAME:
+      from_secret: repo_username
+    REPO_PASSWORD:
+      from_secret: repo_password
+    SSH_PASSWORD:
+      from_secret: ssh_password
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+  volumes:
+  - name: output
+    path: /output
+  - name: scratch
+    path: /scratch

-# - name: Kubernetes Upgrade Appliance
-#   depends_on:
-#   - Install Ansible Galaxy collections
-#   image: bv11-cr01.bessems.eu/library/packer-extended
-#   pull: alwaysquery(
-#   commands:
-#   - |
-#     sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
-#       packer/preseed/UbuntuServer22.04/user-data
-#   - |
-#     export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
-#   - |
-#     packer init -upgrade \
-#       ./packer
-#   - |
-#     packer validate \
-#       -only=vsphere-iso.upgrade \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
-#       ./packer
-#   - |
-#     packer build \
-#       -on-error=cleanup -timestamp-ui \
-#       -only=vsphere-iso.upgrade \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
-#       ./packer
-#   environment:
-#     DOCKER_USERNAME:
-#       from_secret: docker_username
-#     DOCKER_PASSWORD:
-#       from_secret: docker_password
-#     # PACKER_LOG: 1
-#     REPO_USERNAME:
-#       from_secret: repo_username
-#     REPO_PASSWORD:
-#       from_secret: repo_password
-#     SSH_PASSWORD:
-#       from_secret: ssh_password
-#     VSPHERE_PASSWORD:
-#       from_secret: vsphere_password
-#   volumes:
-#   - name: output
-#     path: /output
-#   - name: scratch
-#     path: /scratch
-
-# - name: Remove temporary resources
-#   depends_on:
-#   - Kubernetes Bootstrap Appliance
-#   - Kubernetes Upgrade Appliance
-#   image: bv11-cr01.bessems.eu/library/packer-extended
-#   commands:
-#   - |
-#     pwsh -file scripts/Remove-Resources.ps1 \
-#       -VMName $DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
-#       -VSphereFQDN 'bv11-vc.bessems.lan' \
-#       -VSphereUsername 'administrator@vsphere.local' \
-#       -VSpherePassword $${VSPHERE_PASSWORD}
-#   environment:
-#     VSPHERE_PASSWORD:
-#       from_secret: vsphere_password
-#   volumes:
-#   - name: scratch
-#     path: /scratch
-#   when:
-#     status:
-#     - success
-#     - failure
+- name: Remove temporary resources
+  depends_on:
+  - Kubernetes Bootstrap Appliance
+  - Kubernetes Upgrade Appliance
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  commands:
+  - |
+    pwsh -file scripts/Remove-Resources.ps1 \
+      -VMName $DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -VSphereFQDN 'bv11-vc.bessems.lan' \
+      -VSphereUsername 'administrator@vsphere.local' \
+      -VSpherePassword $${VSPHERE_PASSWORD}
+  environment:
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+  volumes:
+  - name: scratch
+    path: /scratch
+  when:
+    status:
+    - success
+    - failure
--- a/.releaserc.json.DISABLED
+++ b/.releaserc.json.DISABLED
@ -0,0 +1,11 @@
+{
+    "plugins": [
+        ["@semantic-release/commit-analyzer"],
+        ["@semantic-release/release-notes-generator"],
+        ["@semantic-release/exec", {
+            "prepareCmd": "export SEMANTICRELEASE_NEXTRELEASEVERSION=${nextRelease.version}",
+            "publishCmd": "echo $SEMANTICRELEASE_NEXTRELEASEVERSION"
+        }],
+        ["@semantic-release/git"]
+    ]
+}
--- a/packer/build.pkr.hcl
+++ b/packer/build.pkr.hcl
@ -45,7 +45,7 @@ build {
      " -ManifestFileName '/scratch/bld_${var.vm_name}_${source.name}.mf'",
      "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
      " '/scratch/bld_${var.vm_name}_${source.name}.ovf' \\",
-      " /output/airgapped-k8s-${var.k8s_version}.${source.name}.ova"
+      " /output/airgapped-k8s-${var.next_release_version}+${var.k8s_version}-${source.name}.ova"
    ]
  }
 }
--- a/packer/variables.pkr.hcl
+++ b/packer/variables.pkr.hcl
@ -35,3 +35,4 @@ variable "docker_password" {
 }

 variable "k8s_version" {}
+variable "next_release_version" {}
Author	SHA1	Message	Date
Danny Bessems	1f55ff7cfa	build: Revert to semi-working syntax Some checks failed continuous-integration/drone/push Build is failing Details	2023-06-20 16:30:49 +02:00
Danny Bessems	ba4a0148ff	build: Try different syntax (remove quotes) Some checks failed continuous-integration/drone/push Build is failing Details	2023-06-20 15:44:45 +02:00
Danny Bessems	c177dbd03b	build: Test different syntax for character escape Some checks failed continuous-integration/drone/push Build is failing Details	2023-06-20 15:40:39 +02:00
Danny Bessems	2e8ce6cc00	build: Escape escape sequence characters Some checks failed continuous-integration/drone/push Build is failing Details	2023-06-20 15:37:36 +02:00
Danny Bessems	7fd1cf73db	build: Fix linebreak Some checks failed continuous-integration/drone/push Build is failing Details	2023-06-20 15:35:09 +02:00
Danny Bessems	cf001cd0ce	build:Test explicit tag format Some checks failed continuous-integration/drone/push Build is failing Details	2023-06-20 15:32:53 +02:00
Danny Bessems	438b944011	build: Add missing variable export All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-22 13:43:53 +02:00
Danny Bessems	679a9457b5	build:Fix variable name All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-22 12:44:13 +02:00
Danny Bessems	8b4a1e380c	build:Test semantic-release + build flow Some checks failed continuous-integration/drone/push Build is failing Details	2023-05-22 12:19:10 +02:00
Danny Bessems	0468cd6269	build:Debug echo to file All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-22 12:11:14 +02:00
Danny Bessems	b808397d47	build:Fix var substitution Some checks failed continuous-integration/drone/push Build is failing Details	2023-05-22 12:08:01 +02:00
Danny Bessems	8fd0136bb7	build:debug brace mismatch #2 Some checks failed continuous-integration/drone/push Build is failing Details	2023-05-22 12:06:14 +02:00
Danny Bessems	479d896599	build:Debug brace mismatch Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2023-05-22 12:05:32 +02:00
Danny Bessems	263f156eb1	build:Try different syntax Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2023-05-22 11:55:28 +02:00
Danny Bessems	f1dfc83d7c	build:Revert back to cli arguments while specifying custom command Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2023-05-22 09:23:44 +02:00
Danny Bessems	5b950a3834	build:Test with configuration in .releaserc.json All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-22 09:09:50 +02:00
Danny Bessems	978f39d45b	build: Test different semantic-release plugins All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-21 18:27:34 +02:00
Danny Bessems	9b9ab6b784	build:Skip build on tag All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-21 18:09:22 +02:00
Danny Bessems	24dca2755a	fix: Run semantic-release with different drone variable as input All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-21 18:02:00 +02:00
Danny Bessems	0d1db2f29f	feat: Test semantic-release dry-run #2 All checks were successful continuous-integration/drone/push Build is passing Details	2023-05-21 17:51:04 +02:00