From 720a37ec16362715d5d15c99dc0ec871b093a866 Mon Sep 17 00:00:00 2001 From: Nick Muerdter Date: Wed, 20 Jan 2016 22:09:24 -0700 Subject: [PATCH] Test upgrade from v0.10 packages during v0.11 package building. --- Makefile | 32 ++++++++++++++++++- .../spec/localhost/service_spec.rb | 1 + 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b47afd8eb..3099cfc20 100644 --- a/Makefile +++ b/Makefile @@ -1134,6 +1134,10 @@ $(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.9.0-1.el6.x86_64.rpm: mkdir -p $(shell dirname $@) curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el6/api-umbrella-0.9.0-1.el6.x86_64.rpm +$(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.10.0-1.el6.x86_64.rpm: + mkdir -p $(shell dirname $@) + curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el6/api-umbrella-0.10.0-1.el6.x86_64.rpm + $(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.8.0-1.el7.x86_64.rpm: mkdir -p $(shell dirname $@) curl -L -o $@ http://sourceforge.net/projects/api-umbrella/files/el/7/api-umbrella-0.8.0-1.el7.x86_64.rpm/download @@ -1142,6 +1146,10 @@ $(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.9.0-1.el7.x86_64.rpm: mkdir -p $(shell dirname $@) curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el7/api-umbrella-0.9.0-1.el7.x86_64.rpm +$(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.10.0-1.el7.x86_64.rpm: + mkdir -p $(shell dirname $@) + curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el7/api-umbrella-0.10.0-1.el7.x86_64.rpm + $(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.8.0-1_amd64.deb: mkdir -p $(shell dirname $@) curl -L -o $@ http://sourceforge.net/projects/api-umbrella/files/ubuntu/12.04/api-umbrella_0.8.0-1_amd64.deb/download @@ -1150,6 +1158,10 @@ $(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.9.0-1~precise_amd64.deb: mkdir -p $(shell dirname $@) curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-ubuntu/pool/main/a/api-umbrella/api-umbrella_0.9.0-1%7Eprecise_amd64.deb +$(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.10.0-1~precise_amd64.deb: + mkdir -p $(shell dirname $@) + curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-ubuntu/pool/main/a/api-umbrella/api-umbrella_0.10.0-1%7Eprecise_amd64.deb + $(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.8.0-1_amd64.deb: mkdir -p $(shell dirname $@) curl -L -o $@ http://sourceforge.net/projects/api-umbrella/files/ubuntu/14.04/api-umbrella_0.8.0-1_amd64.deb/download @@ -1158,6 +1170,10 @@ $(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.9.0-1~trusty_amd64.deb: mkdir -p $(shell dirname $@) curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-ubuntu/pool/main/a/api-umbrella/api-umbrella_0.9.0-1%7Etrusty_amd64.deb +$(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.10.0-1~trusty_amd64.deb: + mkdir -p $(shell dirname $@) + curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-ubuntu/pool/main/a/api-umbrella/api-umbrella_0.10.0-1%7Etrusty_amd64.deb + $(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.8.0-1_amd64.deb: mkdir -p $(shell dirname $@) curl -L -o $@ http://sourceforge.net/projects/api-umbrella/files/debian/7/api-umbrella_0.8.0-1_amd64.deb/download @@ -1166,22 +1182,36 @@ $(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.9.0-1~wheezy_amd64.deb: mkdir -p $(shell dirname $@) curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-debian/pool/main/a/api-umbrella/api-umbrella_0.9.0-1%7Ewheezy_amd64.deb +$(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.10.0-1~wheezy_amd64.deb: + mkdir -p $(shell dirname $@) + curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-debian/pool/main/a/api-umbrella/api-umbrella_0.10.0-1%7Ewheezy_amd64.deb + $(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.9.0-1~jessie_amd64.deb: mkdir -p $(shell dirname $@) curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-debian/pool/main/a/api-umbrella/api-umbrella_0.9.0-1%7Ejessie_amd64.deb +$(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.10.0-1~jessie_amd64.deb: + mkdir -p $(shell dirname $@) + curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-debian/pool/main/a/api-umbrella/api-umbrella_0.10.0-1%7Ejessie_amd64.deb + download_verify_package_deps: \ $(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.8.0-1.el6.x86_64.rpm \ $(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.9.0-1.el6.x86_64.rpm \ + $(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.10.0-1.el6.x86_64.rpm \ $(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.8.0-1.el7.x86_64.rpm \ $(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.9.0-1.el7.x86_64.rpm \ + $(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.10.0-1.el7.x86_64.rpm \ $(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.8.0-1_amd64.deb \ $(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.9.0-1~precise_amd64.deb \ + $(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.10.0-1~precise_amd64.deb \ $(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.8.0-1_amd64.deb \ $(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.9.0-1~trusty_amd64.deb \ + $(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.10.0-1~trusty_amd64.deb \ $(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.8.0-1_amd64.deb \ $(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.9.0-1~wheezy_amd64.deb \ - $(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.9.0-1~jessie_amd64.deb + $(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.10.0-1~wheezy_amd64.deb \ + $(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.9.0-1~jessie_amd64.deb \ + $(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.10.0-1~jessie_amd64.deb package: $(BUILD_DIR)/package/build diff --git a/build/verify_package/spec/localhost/service_spec.rb b/build/verify_package/spec/localhost/service_spec.rb index a00d3fbcb..b1822bc0f 100644 --- a/build/verify_package/spec/localhost/service_spec.rb +++ b/build/verify_package/spec/localhost/service_spec.rb @@ -523,4 +523,5 @@ def install_package(version) end it_behaves_like "package upgrade", "0.9.0" + it_behaves_like "package upgrade", "0.10.0" end