Bug 1173459 - Stop generating partial MAR files and publishing complete MARs to balrog as a part of nightly automation. r=mshal,a=sledru

This commit is contained in:
Rail Aliiev 2015-08-20 13:45:32 -04:00
Родитель 4da5fe8431
Коммит 51d75c40ca
1 изменённых файлов: 1 добавлений и 23 удалений

Просмотреть файл

@ -31,7 +31,7 @@ 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
@ -77,25 +77,3 @@ partial-patch:: $(dir-stage)
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