Skip to content

Commit

Permalink
Rollback changes in mta release (#3370)
Browse files Browse the repository at this point in the history
* Rollback changes in mta release

* Change deployment path in Makefile for autoscaler to use relative DEST path

* Improve MTAR build process in Makefile

 - Add variable for MTAR filename with versioning
 - Update build command to use the new MTAR_FILENAME variable
 - Change destination path for the built MTAR file
 - Fix typo in build message

* Update default build destination to /tmp/build in autoscaler Makefile
  • Loading branch information
bonzofenix authored Nov 27, 2024
1 parent c98a68b commit 96f93be
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions src/autoscaler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ MAKEFLAGS := -s
aes_terminal_font_yellow := \e[38;2;255;255;0m
aes_terminal_reset := \e[0m
VERSION ?= 0.0.0-rc.1
DEST ?= build
DEST ?= /tmp/build
MTAR_FILENAME ?= app-autoscaler-release-v$(VERSION).mtar

GO_VERSION = $(shell go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/')
GO_DEPENDENCIES = $(shell find . -type f -name '*.go')
Expand Down Expand Up @@ -158,7 +159,7 @@ clean:
mta-deploy: mta-build build-extension-file
$(MAKE) -f metricsforwarder/Makefile set-security-group
@echo "Deploying with extension file: $(EXTENSION_FILE)"
@cf deploy $(MAKEFILE_DIR)/$(DEST)/*.mtar --version-rule ALL -f --delete-services -e $(EXTENSION_FILE)
@cf deploy $(DEST)/*.mtar --version-rule ALL -f --delete-services -e $(EXTENSION_FILE)


build-extension-file:
Expand All @@ -172,11 +173,12 @@ mta-logs:

.PHONY: mta-build
mta-build: mta-build-clean
@echo "bulding mtar file for version: $(VERSION)"
@cp mta.tpl.yaml mta.yaml
@sed -i 's/VERSION/$(VERSION)/g' mta.yaml
@mbt build
@mkdir -p "${PWD}/$(DEST)" && mv ${PWD}/mta_archives/com.github.cloudfoundry.app-autoscaler-release_$(VERSION).mtar ${PWD}/$(DEST)/app-autoscaler-release-v$(VERSION).mtar
@echo "building mtar file for version: $(VERSION)"
cp mta.tpl.yaml mta.yaml
sed -i 's/VERSION/$(VERSION)/g' mta.yaml
mkdir -p $(DEST)
mbt build -t /tmp --mtar $(MTAR_FILENAME)
@mv /tmp/$(MTAR_FILENAME) $(DEST)/$(MTAR_FILENAME)

mta-build-clean:
rm -rf mta_archives

0 comments on commit 96f93be

Please sign in to comment.