1. photon
  2. Commit 23cb20703dcc79899376e4358a9efc8f4a201287
Browse code

Fix the photon iso path for cloud images

Change-Id: I12848c815e227825d64be5e12988c68a10055f47
Reviewed-on: http://photon-jenkins.eng.vmware.com/137
Reviewed-by: Sharath George
Tested-by: jenkins-photon <wangnan2015@hotmail.com>

suezzelur authored on 2015/11/17 06:14:34
Showing 2 changed files
Makefile
History View file @ 23cb207
... ... 
@@ -384,16 +384,16 @@ photon-vagrant-local: check-packer check-vagrant
384 384 
 cloud-image: $(PHOTON_STAGE) iso
385 385 
 	@echo "Building cloud image $(IMG_NAME)..."
386 386 
 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)
387 
-	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)
387 
+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)
388 388
389 389
390 390 
 cloud-image-all: $(PHOTON_STAGE) iso
391 391 
 	@echo "Building cloud images - gce, ami, azure and ova..."
392 392 
 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)
393 
-	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) gce $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)
394 
-	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ami $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)
395 
-	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) azure $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)
396 
-	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ova $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)
393 
+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) gce $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)
394 
+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ami $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)
395 
+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) azure $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)
396 
+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ova $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)
397 397
398 398
399 399 
 check: check-bison check-g++ check-gawk check-createrepo check-texinfo check-sanity check-docker
support/cloud-image-builder/cloud-image-build.sh
History View file @ 23cb207
... ... 
@@ -15,14 +15,13 @@ BUILD_SCRIPTS_PATH=$1
15 15 
 IMG_NAME=$2
16 16 
 SRC_ROOT=$3
17 17 
 GENERATED_DATA_PATH=$4
18 
-PHOTON_STAGE_PATH=$5
18 
+PHOTON_ISO_PATH=$5
19 
+PHOTON_STAGE_PATH=${PHOTON_ISO_PATH%/*}
19 20 
 ADDITIONAL_RPMS_PATH=$6
20 21 
 INSTALLER_PATH=$PHOTON_STAGE_PATH/$IMG_NAME
21 
-PHOTON_ISO_PATH=$PHOTON_STAGE_PATH/photon.iso
22 22 
 ISO_MOUNT_FOLDER=$PHOTON_STAGE_PATH/iso_mount
23 23
24 24 
 PHOTON_IMG_OUTPUT_PATH=$PHOTON_STAGE_PATH/$IMG_NAME
25 
-
26 25 
 VMDK_CONFIG_FILE=${BUILD_SCRIPTS_PATH}/$IMG_NAME/vmdk_$IMG_NAME.json
27 26 
 VMDK_CONFIG_SAFE_FILE=${BUILD_SCRIPTS_PATH}/$IMG_NAME/vmdk_safe_$IMG_NAME.json
28 27
... ... 
@@ -104,7 +103,7 @@ if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ] && [ $IMG_NAME != "ova_
104 104 
     cp $ISO_MOUNT_FOLDER/isolinux/initrd.img /tmp/initrd.gz
105 105 
     gunzip /tmp/initrd.gz
106 106 
     cd /tmp
107 
-    cpio -id < initrd
107 
+    cpio -idu < initrd
108 108 
     cp /tmp/installer/boot/initrd.img* $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/boot/
109 109 
     rm -rf /tmp/initrd*
110 110 
     rm -rf /tmp/installer