1. photon
  2. Commit f0bfcef4730917bf69dac2b36f88893958dcb1eb
Browse code

Change publish cache to use rpmfilelist

Change-Id: Ib087231281edbfb72824686cf9e511ac8730b48e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3420
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Tested-by: Sharath George

suezzelur authored on 2017/08/05 08:16:15
Showing 4 changed files
Makefile
History View file @ f0bfcef
... ... 
@@ -334,13 +334,15 @@ publish-x-rpms:
334 334
335 335 
 publish-rpms-cached:
336 336 
 	@echo "Using cached publish rpms..."
337 
-	@$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR) && \
338 
-	 $(CP) -rf $(PHOTON_PUBLISH_RPMS_PATH)/* $(PHOTON_PUBLISH_RPMS_DIR)/
337 
+	@$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR)/{x86_64,noarch} && \
338 
+	cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \
339 
+        $(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR) $(PHOTON_PUBLISH_RPMS_PATH)
339 340
340 341 
 publish-x-rpms-cached:
341 342 
 	@echo "Using ..."
342 
-	@$(MKDIR) -p $(PHOTON_PUBLISH_XRPMS_DIR) && \
343 
-        $(CP) -rf $(PHOTON_PUBLISH_XRPMS_PATH)/* $(PHOTON_PUBLISH_XRPMS_DIR)/
343 
+	@$(MKDIR) -p $(PHOTON_PUBLISH_XRPMS_DIR)/{x86_64,noarch} && \
344 
+	cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \
345 
+        $(PHOTON_PULL_PUBLISH_X_RPMS) $(PHOTON_PUBLISH_XRPMS_DIR) $(PHOTON_PUBLISH_XRPMS_PATH)
344 346
345 347 
 $(PHOTON_STAGE):
346 348 
 	@echo "Creating staging folder..."
support/pullpublishrpms/pullpublishXrpms.sh
History View file @ f0bfcef
... ... 
@@ -15,4 +15,9 @@ fi
15 15
16 16 
 PUBLISHRPMSPATHDIR=$1
17 17
18 
-cat xrpmfilelist | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_x_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}
18 
+if [ $# -eq 2 ]; then
19 
+   PUBLISHCACHE=$2
20 
+   while read FILE; do cp -r $PUBLISHCACHE/$FILE $PUBLISHRPMSPATHDIR/$FILE; done < xrpmfilelist
21 
+else
22 
+   cat xrpmfilelist | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_x_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}
23 
+fi
support/pullpublishrpms/pullpublishrpms.sh
History View file @ f0bfcef
... ... 
@@ -15,4 +15,9 @@ fi
15 15
16 16 
 PUBLISHRPMSPATHDIR=$1
17 17
18 
-cat rpmfilelist | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}
18 
+if [ $# -eq 2 ]; then
19 
+   PUBLISHCACHE=$2
20 
+   while read FILE; do cp -r $PUBLISHCACHE/$FILE $PUBLISHRPMSPATHDIR/$FILE; done < rpmfilelist
21 
+else
22 
+   cat rpmfilelist | awk '{print "https://bintray.com/artifact/download/vmware/photon_publish_rpms/"$1}' | xargs -n 1 -P 10 wget --user-agent Mozilla/4.0 -c -nv -nc -r -nH --cut-dirs=4 -P ${PUBLISHRPMSPATHDIR}
23 
+fi
support/pullpublishrpms/rpmfilelist
History View file @ f0bfcef
... ... 
@@ -48,7 +48,7 @@ x86_64/libgomp-5.3.0-1.ph1.x86_64.rpm
48 48 
 x86_64/readline-devel-7.0-1.ph1.x86_64.rpm
49 49 
 x86_64/sqlite-autoconf-3.11.0-1.ph1.x86_64.rpm
50 50 
 x86_64/flex-2.5.39-1.ph1.x86_64.rpm
51 
-x86_64/libstdc%2B%2B-devel-5.3.0-1.ph1.x86_64.rpm
51 
+x86_64/libstdc++-devel-5.3.0-1.ph1.x86_64.rpm
52 52 
 x86_64/openssl-1.0.2g-1.ph1.x86_64.rpm
53 53 
 x86_64/elfutils-0.165-1.ph1.x86_64.rpm
54 54 
 x86_64/expat-2.1.0-1.ph1.x86_64.rpm
... ... 
@@ -71,7 +71,7 @@ x86_64/pkg-config-0.28-1.ph1.x86_64.rpm
71 71 
 x86_64/popt-devel-1.16-1.ph1.x86_64.rpm
72 72 
 x86_64/flex-devel-2.5.39-1.ph1.x86_64.rpm
73 73 
 x86_64/findutils-4.4.2-1.ph1.x86_64.rpm
74 
-x86_64/libstdc%2B%2B-5.3.0-1.ph1.x86_64.rpm
74 
+x86_64/libstdc++-5.3.0-1.ph1.x86_64.rpm
75 75 
 x86_64/libpipeline-1.4.1-1.ph1.x86_64.rpm
76 76 
 x86_64/make-4.1-1.ph1.x86_64.rpm
77 77 
 x86_64/glibc-devel-2.22-3.ph1.x86_64.rpm