rename image

openoms · Dec 6, 2022 · f2bdc42 · f2bdc42
1 parent cb31fe5
commit f2bdc42
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/amd64-image-build.yml b/.github/workflows/amd64-image-build.yml
@@ -31,33 +31,33 @@ jobs:
           echo "BUILD_VERSION=$(git describe --always --tags)" >> $GITHUB_ENV
 
       - name: Hello JoininBox
-        run: echo "Building the debian-11.5-amd64-image-${{ env.BUILD_DATE }}-${{ env.BUILD_VERSION }} at "
+        run: echo "Building the joininbox-amd64-debian-11.5-image-${{ env.BUILD_DATE }}-${{ env.BUILD_VERSION }} at "
 
       - name: Run the build script
         run: |
           cd ci/amd64
-          bash packer.build.amd64.sh $GITHUB_ACTOR $GITHUB_HEAD_REF
+          bash packer.build.amd64-debian.sh $GITHUB_ACTOR $GITHUB_HEAD_REF
 
       - name: Compute checksum of the raw image
         run: |
-          cd ci/amd64/builds/packer-debian-11.5-amd64-qemu/
-          sha256sum debian-11.5-amd64.qcow2 > debian-11.5-amd64.qcow2.sha256
+          cd ci/amd64/builds/joininbox-amd64-debian-11.5-qemu/
+          sha256sum joininbox-amd64-debian-11.5.qcow2 > joininbox-amd64-debian-11.5.qcow2.sha256
 
       - name: Compress image
         run: |
-          cd ci/amd64/builds/packer-debian-11.5-amd64-qemu/
-          gzip -v9 debian-11.5-amd64.qcow2
+          cd ci/amd64/builds/joininbox-amd64-debian-11.5-qemu/
+          gzip -v9 joininbox-amd64-debian-11.5.qcow2
 
       - name: Compute checksum of the compressed image
         run: |
-          cd ci/amd64/builds/packer-debian-11.5-amd64-qemu/
-          sha256sum debian-11.5-amd64.qcow2.gz > debian-11.5-amd64.qcow2.gz.sha256
+          cd ci/amd64/builds/joininbox-amd64-debian-11.5-qemu/
+          sha256sum joininbox-amd64-debian-11.5.qcow2.gz > joininbox-amd64-debian-11.5.qcow2.gz.sha256
 
       - name: Upload the image and checksums
         uses: actions/upload-artifact@v3
         with:
           name: joininbox-amd64-image-${{ env.BUILD_DATE }}-${{ env.BUILD_VERSION }}
           path: |
-            ${{ github.workspace }}/ci/amd64/builds/packer-debian-11.5-amd64-qemu/debian-11.5-amd64.qcow2.sha256
-            ${{ github.workspace }}/ci/amd64/builds/packer-debian-11.5-amd64-qemu/debian-11.5-amd64.qcow2.gz
-            ${{ github.workspace }}/ci/amd64/builds/packer-debian-11.5-amd64-qemu/debian-11.5-amd64.qcow2.gz.sha256
+            ${{ github.workspace }}/ci/amd64/builds/joininbox-amd64-debian-11.5-qemu/joininbox-amd64-debian-11.5.qcow2.sha256
+            ${{ github.workspace }}/ci/amd64/builds/joininbox-amd64-debian-11.5-qemu/joininbox-amd64-debian-11.5.qcow2.gz
+            ${{ github.workspace }}/ci/amd64/builds/joininbox-amd64-debian-11.5-qemu/joininbox-amd64-debian-11.5.qcow2.gz.sha256
diff --git a/Makefile b/Makefile
@@ -6,11 +6,11 @@ amd64-image:
 	cd ci/amd64 && \
 	bash packer.build.amd64.sh $(GITHUB_USER) $(CURRENT_BRANCH)
 
-	cd ci/amd64/builds/packer-debian-11.5-amd64-qemu && \
-	sha256sum debian-11.5-amd64.qcow2 > debian-11.5-amd64.qcow2.sha256
+	cd ci/amd64/builds/joininbox-amd64-debian-11.5-qemu && \
+	sha256sum joininbox-amd64-debian-11.5.qcow2 > joininbox-amd64-debian-11.5.qcow2.sha256
 
-	cd ci/amd64/builds/packer-debian-11.5-amd64-qemu && \
-	gzip -v9 debian-11.5-amd64.qcow2
+	cd ci/amd64/builds/joininbox-amd64-debian-11.5-qemu && \
+	gzip -v9 joininbox-amd64-debian-11.5.qcow2
 
-	cd ci/amd64/builds/packer-debian-11.5-amd64-qemu && \
-	sha256sum debian-11.5-amd64.qcow2.gz > debian-11.5-amd64.qcow2.gz.sha256
+	cd ci/amd64/builds/joininbox-amd64-debian-11.5-qemu && \
+	sha256sum joininbox-amd64-debian-11.5.qcow2.gz > joininbox-amd64-debian-11.5.qcow2.gz.sha256
diff --git a/ci/amd64/debian/debian-11.5-amd64.json → ci/amd64/debian/joininbox-amd64-debian.json b/ci/amd64/debian/debian-11.5-amd64.json → ci/amd64/debian/joininbox-amd64-debian.json
@@ -1,7 +1,7 @@
 {
   "variables": {
   "box_basename": "debian-11.5",
-  "build_directory": "./builds",
+  "build_directory": "builds",
   "build_timestamp": "{{isotime \"20060102150405\"}}",
   "cpus": "2",
   "disk_size": "30000",
@@ -21,7 +21,7 @@
   "preseed_path": "debian-9/preseed.cfg",
   "qemu_display": "none",
   "qemu_bios": "bios-256k.bin",
-  "template": "debian-11.5-amd64",
+  "template": "joininbox-joininbox-amd64-debian-11.5",
   "boot_command": "<esc><wait>install <wait> preseed/url=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{user `preseed_path`}} <wait>debian-installer=en_US.UTF-8 <wait>auto <wait>locale=en_US.UTF-8 <wait>kbd-chooser/method=us <wait>keyboard-configuration/xkb-keymap=us <wait>netcfg/get_hostname={{ .Name }} <wait>netcfg/get_domain=vagrantup.com <wait>fb=false <wait>debconf/frontend=noninteractive <wait>console-setup/ask_detect=false <wait>console-keymaps-at/keymap=us <wait>grub-installer/bootdev=default <wait><enter><wait>",
   "version": "TIMESTAMP"
 },
@@ -36,7 +36,7 @@
       "iso_checksum": "{{user `iso_checksum`}}",
       "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}",
       "memory": "{{ user `memory` }}",
-      "output_directory": "{{ user `build_directory` }}/packer-{{user `template`}}-qemu",
+      "output_directory": "{{ user `build_directory` }}/{{user `template`}}-qemu",
       "shutdown_command": "echo 'joininbox' | sudo /sbin/shutdown -hP now",
       "ssh_password": "joininbox",
       "ssh_port": 22,

diff --git a/ci/amd64/packer.build.amd64.sh → ci/amd64/packer.build.amd64-debian.sh b/ci/amd64/packer.build.amd64.sh → ci/amd64/packer.build.amd64-debian.sh
@@ -28,4 +28,4 @@ echo -e "\nBuilding image..."
 cd debian
 PACKER_LOG=1 packer build \
  -var github_user=${github_user} -var branch=${branch} \
- -only=qemu debian-11.5-amd64.json
+ -only=qemu joininbox-amd64-debian.json