Merge ~ballot/cassandra-charm/+git/cassandra-charm:expose_internode into cassandra-charm:master

[Benjamin Allot]

Add build and publish target for Makefile

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Colin Misare (cmisare)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 7566442faa9d8fc4717513ddd73006bb1f86b52c

diff --git a/Makefile b/Makefile
index a118932..b1669d1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-BUILDDEST ?= ${JUJU_REPOSITORY}
-BUILDDEST ?= ./build
-
 SHELL := /bin/bash
 export SHELLOPTS:=errexit:pipefail
 
+clean:
+	charmcraft clean
+
+charmbuild: clean
+	charmcraft pack 
+
+publish:
+	charmcraft upload cassandra_ubuntu-20.04-amd64_ubuntu-18.04-amd64_ubuntu-16.04-amd64.charm
+	@echo "To release, run charmcraft release --channel <stable|edge|beta|candidate> --revision <revision> cassandra "
 
-charmbuild:
-	charm build --no-local-layers -w wheelhouse_overrides.txt -o ${BUILDDEST}
 
 testdeps:
 	sudo apt install tox
@@ -35,77 +39,8 @@ test: unittest
 unittest:
 	tox
 
+.PHONY: clean charmbuild testdeps test unittest
 
-# ftest: unittest Test1UnitDeployment
-# Test1UnitDeployment: deps
-# 	date
-# 	AMULET_TIMEOUT=5400 \
-# 	$(NOSETESTS) tests.test_integration:Test1UnitDeployment 2>&1 | ts
-# 	
-# 20test: unittest Test20Deployment
-# Test20Deployment: deps
-# 	date
-# 	AMULET_TIMEOUT=5400 \
-# 	$(NOSETESTS) tests.test_integration:Test20Deployment 2>&1 | ts
-# 
-# 21test: unittest Test21Deployment
-# Test21Deployment: deps
-# 	date
-# 	AMULET_TIMEOUT=5400 \
-# 	$(NOSETESTS) tests.test_integration:Test21Deployment 2>&1 | ts
-# 
-# 22test: unittest Test22Deployment
-# Test22Deployment: deps
-# 	date
-# 	AMULET_TIMEOUT=5400 \
-# 	$(NOSETESTS) tests.test_integration:Test22Deployment 2>&1 | ts
-# 			
-# 3test: unittest Test3UnitDeployment
-# Test3UnitDeployment: deps
-# 	date
-# 	AMULET_TIMEOUT=7200 \
-# 	$(NOSETESTS) tests.test_integration:Test3UnitDeployment 2>&1 | ts
-# 
-# authtest: unittest TestAllowAllAuthenticatorDeployment
-# TestAllowAllAuthenticatorDeployment: deps
-# 	date
-# 	AMULET_TIMEOUT=7200 \
-# 	$(NOSETESTS) \
-# 	tests.test_integration:TestAllowAllAuthenticatorDeployment 2>&1 | ts
-# 
-# # Place a copy of the Oracle Java SE 8 Server Runtime tarball in ./lib
-# # to run these tests.
-# jretest: unittest
-# 	AMULET_TIMEOUT=5400 \
-# 	$(NOSETESTS) tests.test_integration:TestOracleJREDeployment 2>&1 | ts
-# 
-# # You need the Oracle JRE (per jretest) and set the DSE_SOURCE environment
-# # variable for this to work:
-# #     DSE_SOURCE="deb http://un:[e-mail]/enterprise stable main"
-# # You will also need a cache like squid-deb-proxy and have tweaked it to
-# # cache the authenticated files, or the tests will likely timeout waiting
-# # for huge downloads to complete. Alternatively, mirror the DataStax
-# # packages into your own private archive.
-# dsetest: unittest
-# 	AMULET_TIMEOUT=5400 \
-# 	$(NOSETESTS) tests.test_integration:TestDSEDeployment 2>&1 | ts
-# 
-# coverage: lint
-# 	$(NOSETESTS) \
-# 	    tests.test_actions        --cover-package=actions \
-# 	    tests.test_helpers        --cover-package=helpers \
-# 	    tests.test_definitions    --cover-package=definitions \
-# 	    --with-coverage --cover-branches \
-# 	    --cover-html --cover-html-dir=coverage \
-# 	    --cover-min-percentage=100 || \
-# 		(gnome-open coverage/index.html; false)
-# 
-# clean:
-# 	rm -rf .venv? tests/.venv? .stamp-* coverage .coverage
-# 	find . -name __pycache__ -type d | xargs rm -rf
-# 	find . -name \*~ -type f | xargs rm -f
-# 
-# 
 # 
 # venv3: .stamp-venv3
 # .stamp-venv3:
@@ -148,26 +83,3 @@ unittest:
 # 	    echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'; \
 # 	    echo '!!! There are uncommitted changes !!!'; \
 # 	    echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'; \
-# 	    false; \
-# 	fi
-# 	git clean -fdx
-# 	export rev=`charm push . $(CHARM_STORE_URL) 2>&1 \
-#                 | tee /dev/tty | grep url: | cut -f 2 -d ' '` \
-# 	&& git tag -f -m "$$rev" `echo $$rev | tr -s '~:/' -` \
-# 	&& git push --tags $(REPO) \
-# 	&& charm release -c development $$rev
-# 
-# 
-# publish-stable:
-# 	@if [ -n "`git status --porcelain`" ]; then \
-# 	    echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'; \
-# 	    echo '!!! There are uncommitted changes !!!'; \
-# 	    echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'; \
-# 	    false; \
-# 	fi
-# 	git clean -fdx
-# 	export rev=`charm push . $(CHARM_STORE_URL) 2>&1 \
-#                 | tee /dev/tty | grep url: | cut -f 2 -d ' '` \
-# 	&& git tag -f -m "$$rev" `echo $$rev | tr -s '~:/' -` \
-# 	&& git push --force --tags $(REPO) \
-# 	&& charm release -c stable $$rev