diff --git a/Makefile b/Makefile index ba45042a19..526239cb2d 100644 --- a/Makefile +++ b/Makefile @@ -287,7 +287,7 @@ minikube-iso-arm64: minikube-iso-aarch64 minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION - echo $(shell git log --no-merges --pretty='format:%H %s' | head -1) >> deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG + cp deploy/iso/minikube-iso/CHANGELOG deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in if [ ! -d $(BUILD_DIR)/buildroot ]; then \ mkdir -p $(BUILD_DIR); \ diff --git a/deploy/iso/minikube-iso/board/minikube/aarch64/rootfs-overlay/etc/CHANGELOG b/deploy/iso/minikube-iso/board/minikube/aarch64/rootfs-overlay/etc/CHANGELOG deleted file mode 100644 index c19cb4dd01..0000000000 --- a/deploy/iso/minikube-iso/board/minikube/aarch64/rootfs-overlay/etc/CHANGELOG +++ /dev/null @@ -1 +0,0 @@ -9d1bcee02221e62882cf3cf1280371cb8f50f3ba swap order of iso builds? diff --git a/deploy/iso/minikube-iso/board/minikube/x86_64/rootfs-overlay/etc/CHANGELOG b/deploy/iso/minikube-iso/board/minikube/x86_64/rootfs-overlay/etc/CHANGELOG deleted file mode 100644 index c19cb4dd01..0000000000 --- a/deploy/iso/minikube-iso/board/minikube/x86_64/rootfs-overlay/etc/CHANGELOG +++ /dev/null @@ -1 +0,0 @@ -9d1bcee02221e62882cf3cf1280371cb8f50f3ba swap order of iso builds? diff --git a/hack/jenkins/build_iso.sh b/hack/jenkins/build_iso.sh index cf1ce8901f..4c05c5f2e0 100755 --- a/hack/jenkins/build_iso.sh +++ b/hack/jenkins/build_iso.sh @@ -37,6 +37,7 @@ if [[ -z $ISO_VERSION ]]; then now=$(date +%s) export ISO_VERSION=$IV-$now-$ghprbPullId export ISO_BUCKET=minikube-builds/iso/$ghprbPullId + echo "#$ghprPullId - $ghprPullTitle" >> deploy/iso/minikube-iso/CHANGELOG else release=true export ISO_VERSION