From dcfdca25a5a8ec374e6044b7667bc847e879e10d Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Fri, 21 Apr 2023 14:02:27 +0200 Subject: [PATCH] Use credentials for source url;Update checksum --- .drone.yml | 6 ++++++ packer/ova/rhel-8.json | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 42cfb0c..804b6be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,6 +25,7 @@ steps: - | jq '.password="'"$VSPHERE_PASSWORD"'"' ./packer/ova/vsphere.json > /tmp/vsphere.json && \ mv /tmp/vsphere.json ./packer/ova/vsphere.json + jq '.repo_username="'"$REPO_USERNAME"'" | .repo_password="'"$REPO_PASSWORD"'"' --null-input > /tmp/extra_vars.json - | make deps-ova - | @@ -32,10 +33,15 @@ steps: - | mv -fv ./output/**/*.ova /output environment: + REPO_USERNAME: + from_secret: repo_username + REPO_PASSWORD: + from_secret: repo_password VSPHERE_PASSWORD: from_secret: vsphere_password IB_OVFTOOL: true IB_OVFTOOL_ARGS: --allowExtraConfig + PACKER_VAR_FILES: /tmp/extra_vars.json volumes: - name: output path: /output diff --git a/packer/ova/rhel-8.json b/packer/ova/rhel-8.json index 81ac9db..b334024 100644 --- a/packer/ova/rhel-8.json +++ b/packer/ova/rhel-8.json @@ -9,9 +9,9 @@ "epel_rpm_gpg_key": "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8", "guest_os_type": "rhel8-64", "http_directory": "./packer/ova/linux/{{user `distro_name`}}/http/", - "iso_checksum": "48f955712454c32718dcde858dea5aca574376a1d7a4b0ed6908ac0b85597811", + "iso_checksum": "47E5DBB37B5970F583D0852973AF86CC1B522EE1F1E2374C59204583C14717FA", "iso_checksum_type": "sha256", - "iso_url": "https://sn.itch.fyi/Repository/iso/Redhat/rhel-8.7-x86_64-boot.iso", + "iso_url": "https://{{ user `repo_username` }}:{{ user `repo_password` }}@sn.itch.fyi/Repository/iso/Redhat/rhel-8.7-x86_64-boot.iso", "os_display_name": "RHEL 8", "redhat_epel_rpm": "https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm", "shutdown_command": "shutdown -P now",