Bug 1173459 - Stop generating partial MAR files and publishing complete MARs to balrog as a part of nightly automation. r=mshal,a=sledru
authorRail Aliiev <rail@mozilla.com>
Thu, 20 Aug 2015 13:45:32 -0400
changeset 288805 60302e9a0a6d250607b763d535951d3dd9e6b1cc
parent 288804 534e581941ea8886c08068a943d81fbbc61bf20d
child 288806 b0b8104219f8c49184564a5e1d7151d60e910409
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, sledru
bugs1173459
milestone42.0a2
Bug 1173459 - Stop generating partial MAR files and publishing complete MARs to balrog as a part of nightly automation. r=mshal,a=sledru
tools/update-packaging/Makefile.in
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -26,17 +26,17 @@ endif
 else
 PACKAGE_DIR	= $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)
 endif
 
 MAR_BIN	= $(LIBXUL_DIST)/host/bin/mar$(HOST_BIN_SUFFIX)
 MBSDIFF_BIN	= $(LIBXUL_DIST)/host/bin/mbsdiff$(HOST_BIN_SUFFIX)
 
 OVERRIDE_DEFAULT_GOAL := full-update
-full-update:: complete-patch $(if $(filter 1,$(MOZ_AUTOMATION_UPDATE_PACKAGING)),automation-partial-patch)
+full-update:: complete-patch
 
 ifeq ($(OS_TARGET), WINNT)
 MOZ_PKG_FORMAT	:= SFX7Z
 UNPACKAGE	= '$(subst $(DIST),$(_ABS_DIST),$(INSTALLER_PACKAGE))'
 ifdef AB_CD
 UNPACKAGE	= '$(PACKAGE_BASE_DIR)/$(PACKAGE)'
 endif
 endif
@@ -72,30 +72,8 @@ partial-patch:: $(dir-stage)
 	MBSDIFF=$(MBSDIFF_BIN) \
 	  $(srcdir)/make_incremental_update.sh \
 	  '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar' \
 	  '$(SRC_BUILD)' \
 	  '$(DST_BUILD)'
 ifdef MOZ_SIGN_CMD
 	$(MOZ_SIGN_CMD) -f mar '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar'
 endif
-
-automation-partial-patch: complete-patch
-	rm -rf current current.work previous
-	mkdir current previous
-	latestmar=$$(ssh -l $(UPLOAD_USER) -i $(UPLOAD_SSH_KEY) $(UPLOAD_HOST) 'ls -1t $(LATEST_MAR_DIR) | grep "\.$(AB_CD)\.$(MOZ_PKG_PLATFORM)\.complete\.mar$$" | head -n 1'); \
-	  if test -n "$$latestmar"; then \
-	    wget -O $(STAGE_DIR)/previous.mar http://$(UPLOAD_HOST)/$(LATEST_MAR_DIR)/$$latestmar && \
-	    (cd previous; \
-	      MAR=$(MAR_BIN) perl $(topsrcdir)/tools/update-packaging/unwrap_full_update.pl '$(STAGE_DIR)/previous.mar') && \
-	    (cd current; \
-	      MAR=$(MAR_BIN) perl $(topsrcdir)/tools/update-packaging/unwrap_full_update.pl '$(abspath $(DIST)/$(COMPLETE_MAR))') && \
-	    find current -name \*.pgc -print -delete && \
-	    find previous -name \*.pgc -print -delete && \
-	    rm -f $(STAGE_DIR)/*.$(AB_CD).$(MOZ_PKG_PLATFORM).partial.*.mar && \
-	    SRC_BUILD_ID=$$(python $(topsrcdir)/config/printconfigsetting.py $$(find previous -maxdepth 4 -type f -name application.ini) App BuildID) \
-	    DST_BUILD_ID=$$(cat $(DEPTH)/config/buildid) \
-	    SRC_BUILD=previous DST_BUILD=current \
-	      $(MAKE) partial-patch && \
-	    rm -f $(STAGE_DIR)/previous.mar; \
-	  else \
-	    echo "No previous MAR found; not creating a partial MAR"; \
-	  fi