1. photon
  2. Commit 332d24faf833ec812b5f749e3e999445a6261018
Browse code

Remove symlinks to build artifacts

Change-Id: Ibac6f2a115028bcc63994e701f0a1986e9c1745a
Reviewed-on: http://photon-jenkins.eng.vmware.com/129
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: <anishs@vmware.com>

Vinay Kulkarni authored on 2015/11/13 04:44:05
Showing 8 changed files
Makefile
History View file @ 332d24f
... ... 
@@ -66,8 +66,7 @@ micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)
66 66 
                 -p $(PHOTON_GENERATED_DATA_DIR)/$(MICRO_PACKAGE_LIST_FILE) \
67 67 
                 -o $(PHOTON_STAGE)/common/data \
68 68 
                 -f > \
69 
-                $(PHOTON_LOGS_DIR)/installer.log 2>&1 && \
70 
-        cd $(PHOTON_STAGE) && ln -fs photon-micro-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso photon-micro.iso
69 
+                $(PHOTON_LOGS_DIR)/installer.log 2>&1
71 70
72 71 
 packages-micro: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists
73 72 
 	@echo "Building all Micro RPMS..."
... ... 
@@ -100,8 +99,7 @@ minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)
100 100 
                 -p $(PHOTON_GENERATED_DATA_DIR)/$(MINIMAL_PACKAGE_LIST_FILE) \
101 101 
                 -o $(PHOTON_STAGE)/common/data \
102 102 
                 -f > \
103 
-                $(PHOTON_LOGS_DIR)/installer.log 2>&1 && \
104 
-        cd $(PHOTON_STAGE) && ln -fs photon-minimal-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso photon-minimal.iso
103 
+                $(PHOTON_LOGS_DIR)/installer.log 2>&1
105 104
106 105 
 ostree-host-iso: check $(PHOTON_STAGE) ostree-repo
107 106 
 	@echo "Building Photon OSTree Host ISO..."
... ... 
@@ -114,8 +112,7 @@ ostree-host-iso: check $(PHOTON_STAGE) ostree-repo
114 114 
                 -p $(PHOTON_GENERATED_DATA_DIR)/build_install_options_ostreehost.json \
115 115 
                 -o $(PHOTON_STAGE)/common/data \
116 116 
                 -f > \
117 
-                $(PHOTON_LOGS_DIR)/installer.log 2>&1 && \
118 
-        cd $(PHOTON_STAGE) && ln -fs photon-ostree-host-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso photon-ostree-host.iso
117 
+                $(PHOTON_LOGS_DIR)/installer.log 2>&1
119 118
120 119 
 live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso
121 120 
 	@echo "Building Photon Minimal LIVE ISO..."
... ... 
@@ -128,8 +125,7 @@ live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso
128 128 
                 -p $(PHOTON_GENERATED_DATA_DIR)/build_install_options_livecd.json \
129 129 
                 -o $(PHOTON_STAGE)/common/data \
130 130 
                 -f > \
131 
-                $(PHOTON_LOGS_DIR)/installer.log 2>&1 && \
132 
-        cd $(PHOTON_STAGE) && ln -fs photon-live-iso-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso photon-live-iso.iso
131 
+                $(PHOTON_LOGS_DIR)/installer.log 2>&1
133 132
134 133 
 packages-minimal: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists
135 134 
 	@echo "Building all RPMS..."
... ... 
@@ -159,8 +155,7 @@ iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo
159 159 
                 -p $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \
160 160 
                 -o $(PHOTON_STAGE)/common/data \
161 161 
                 -f > \
162 
-                $(PHOTON_LOGS_DIR)/installer.log 2>&1 && \
163 
-        cd $(PHOTON_STAGE) && ln -fs photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso photon.iso
162 
+                $(PHOTON_LOGS_DIR)/installer.log 2>&1
164 163
165 164 
 pkgtree:
166 165 
 	@cd $(PHOTON_SPECDEPS_DIR) && \
support/cloud-image-builder/ami/mk-ami-image.sh
History View file @ 332d24f
... ... 
@@ -5,6 +5,5 @@ PHOTON_IMG_OUTPUT_PATH=$1
5 5 
 cd $PHOTON_IMG_OUTPUT_PATH
6 6 
 mv photon-ami.raw photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.raw
7 7 
 tar -Szcf photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.tar.gz photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.raw
8 
-ln -s photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.tar.gz photon-ami.tar.gz
9 8
10 9 
 rm -f photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.raw
support/cloud-image-builder/azure/mk-azure-image.sh
History View file @ 332d24f
... ... 
@@ -7,7 +7,6 @@ mkdir -p $SRC_ROOT/tools/bin
7 7 
 make clean
8 8 
 make
9 9 
 $SRC_ROOT/tools/bin/imgconverter -i $PHOTON_IMG_OUTPUT_PATH/photon-azure.raw -v vhd -o $PHOTON_IMG_OUTPUT_PATH/photon-azure-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.vhd
10 
-cd $PHOTON_IMG_OUTPUT_PATH && ln -s photon-azure-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.vhd photon-azure.vhd
11 10
12 11 
 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-azure.raw
13 12
support/cloud-image-builder/gce/mk-gce-image.sh
History View file @ 332d24f
... ... 
@@ -8,6 +8,5 @@ echo "Creating ${TARFILE} file from ${RAWFILE}."
8 8 
 cd $PHOTON_IMG_OUTPUT_PATH
9 9 
 mv ${RAWFILE} disk.raw
10 10 
 tar -Szcf $PHOTON_IMG_OUTPUT_PATH/${TARFILE} disk.raw
11 
-cd $PHOTON_IMG_OUTPUT_PATH && ln -s ${TARFILE} photon-gce.tar.gz
12 11
13 12 
 rm -f disk.raw
support/cloud-image-builder/ova/mk-ova-image.sh
History View file @ 332d24f
... ... 
@@ -34,7 +34,6 @@ openssl sha1 *.vmdk photon-ova.ovf > photon-ova.mf
34 34 
 tar cf photon-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-ova.ovf photon-ova.mf photon-ova-disk1.vmdk
35 35 
 cp $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/
36 36 
 cd $PHOTON_IMG_OUTPUT_PATH
37 
-ln -s photon-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-ova.ova
38 37 
 rm -rf photon-custom
39 38 
 DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-ova.raw`
40 39 
 kpartx -av $DISK_DEVICE
... ... 
@@ -76,7 +75,6 @@ openssl sha1 *.vmdk photon-custom.ovf > photon-custom.mf
76 76 
 tar cf photon-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-custom.ovf photon-custom.mf photon-custom-disk1.vmdk
77 77 
 cp $PHOTON_IMG_OUTPUT_PATH/temp1/photon-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/
78 78 
 cd $PHOTON_IMG_OUTPUT_PATH
79 
-ln -s photon-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-custom.ova
80 79 
 rm -rf $PHOTON_IMG_OUTPUT_PATH/temp/
81 80 
 rm -rf $PHOTON_IMG_OUTPUT_PATH/temp1/
82 81 
 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova.raw
support/cloud-image-builder/ova_generic/mk-ova_generic-image.sh
History View file @ 332d24f
... ... 
@@ -34,7 +34,6 @@ openssl sha1 *.vmdk photon-generic-ova.ovf > photon-generic-ova.mf
34 34 
 tar cf photon-generic-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-ova.ovf photon-generic-ova.mf photon-generic-ova-disk1.vmdk
35 35 
 cp $PHOTON_IMG_OUTPUT_PATH/temp/photon-generic-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/
36 36 
 cd $PHOTON_IMG_OUTPUT_PATH
37 
-ln -s photon-generic-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-ova.ova
38 37 
 rm -rf photon-generic-custom
39 38 
 DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-ova_generic.raw`
40 39 
 kpartx -av $DISK_DEVICE
... ... 
@@ -76,7 +75,6 @@ openssl sha1 *.vmdk photon-generic-custom.ovf > photon-generic-custom.mf
76 76 
 tar cf photon-generic-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-custom.ovf photon-generic-custom.mf photon-generic-custom-disk1.vmdk
77 77 
 cp $PHOTON_IMG_OUTPUT_PATH/temp1/photon-generic-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/
78 78 
 cd $PHOTON_IMG_OUTPUT_PATH
79 
-ln -s photon-generic-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-custom.ova
80 79 
 rm -rf $PHOTON_IMG_OUTPUT_PATH/temp/
81 80 
 rm -rf $PHOTON_IMG_OUTPUT_PATH/temp1/
82 81 
 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova_generic.raw
support/cloud-image-builder/ova_uefi/mk-ova_uefi-image.sh
History View file @ 332d24f
... ... 
@@ -57,7 +57,6 @@ sed -i '/\/VirtualSystem>/i \ \t<ProductSection> \n \t\t<Info>Information about
57 57 
 openssl sha1 *.vmdk photon-ova-uefi.ovf > photon-ova-uefi.mf
58 58 
 tar cf photon-ova-uefi-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-ova-uefi.ovf photon-ova-uefi.mf photon-ova-uefi-disk1.vmdk
59 59 
 cp $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-uefi-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/
60 
-cd $PHOTON_IMG_OUTPUT_PATH && ln -s photon-ova-uefi-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-ova-uefi.ova
61 60
62 61 
 rm -rf $PHOTON_IMG_OUTPUT_PATH/temp/
63 62
support/dockerfiles/photon/make-docker-image.sh
History View file @ 332d24f
... ... 
@@ -79,9 +79,6 @@ rm -rf var/log/*
79 79 
 tar cpjf ../$ROOTFS_TAR_FILENAME .
80 80 
 mkdir -p $STAGE_DIR
81 81 
 mv ../$ROOTFS_TAR_FILENAME $STAGE_DIR/
82 
-cd $STAGE_DIR
83 
-ln -fs $ROOTFS_TAR_FILENAME photon-rootfs.tar.bz2
84 
-cd $TEMP_CHROOT
85 82 
 cd ..
86 83
87 84 
 # cleanup