Skip to content

Commit 720a37e

Browse files
GUIGUI
committed
Test upgrade from v0.10 packages during v0.11 package building.
1 parent a5ab9c0 commit 720a37e

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

‎Makefile

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,10 @@ $(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.9.0-1.el6.x86_64.rpm:
11341134
mkdir -p $(shell dirname $@)
11351135
curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el6/api-umbrella-0.9.0-1.el6.x86_64.rpm
11361136

1137+
$(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.10.0-1.el6.x86_64.rpm:
1138+
mkdir -p $(shell dirname $@)
1139+
curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el6/api-umbrella-0.10.0-1.el6.x86_64.rpm
1140+
11371141
$(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.8.0-1.el7.x86_64.rpm:
11381142
mkdir -p $(shell dirname $@)
11391143
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:
11421146
mkdir -p $(shell dirname $@)
11431147
curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el7/api-umbrella-0.9.0-1.el7.x86_64.rpm
11441148

1149+
$(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.10.0-1.el7.x86_64.rpm:
1150+
mkdir -p $(shell dirname $@)
1151+
curl -L -o $@ https://bintray.com/artifact/download/nrel/api-umbrella-el7/api-umbrella-0.10.0-1.el7.x86_64.rpm
1152+
11451153
$(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.8.0-1_amd64.deb:
11461154
mkdir -p $(shell dirname $@)
11471155
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:
11501158
mkdir -p $(shell dirname $@)
11511159
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
11521160

1161+
$(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.10.0-1~precise_amd64.deb:
1162+
mkdir -p $(shell dirname $@)
1163+
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
1164+
11531165
$(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.8.0-1_amd64.deb:
11541166
mkdir -p $(shell dirname $@)
11551167
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:
11581170
mkdir -p $(shell dirname $@)
11591171
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
11601172

1173+
$(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.10.0-1~trusty_amd64.deb:
1174+
mkdir -p $(shell dirname $@)
1175+
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
1176+
11611177
$(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.8.0-1_amd64.deb:
11621178
mkdir -p $(shell dirname $@)
11631179
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:
11661182
mkdir -p $(shell dirname $@)
11671183
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
11681184

1185+
$(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.10.0-1~wheezy_amd64.deb:
1186+
mkdir -p $(shell dirname $@)
1187+
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
1188+
11691189
$(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.9.0-1~jessie_amd64.deb:
11701190
mkdir -p $(shell dirname $@)
11711191
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
11721192

1193+
$(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.10.0-1~jessie_amd64.deb:
1194+
mkdir -p $(shell dirname $@)
1195+
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
1196+
11731197
download_verify_package_deps: \
11741198
$(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.8.0-1.el6.x86_64.rpm \
11751199
$(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.9.0-1.el6.x86_64.rpm \
1200+
$(DEPS_DIR)/verify_package/centos-6/api-umbrella-0.10.0-1.el6.x86_64.rpm \
11761201
$(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.8.0-1.el7.x86_64.rpm \
11771202
$(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.9.0-1.el7.x86_64.rpm \
1203+
$(DEPS_DIR)/verify_package/centos-7/api-umbrella-0.10.0-1.el7.x86_64.rpm \
11781204
$(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.8.0-1_amd64.deb \
11791205
$(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.9.0-1~precise_amd64.deb \
1206+
$(DEPS_DIR)/verify_package/ubuntu-12.04/api-umbrella_0.10.0-1~precise_amd64.deb \
11801207
$(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.8.0-1_amd64.deb \
11811208
$(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.9.0-1~trusty_amd64.deb \
1209+
$(DEPS_DIR)/verify_package/ubuntu-14.04/api-umbrella_0.10.0-1~trusty_amd64.deb \
11821210
$(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.8.0-1_amd64.deb \
11831211
$(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.9.0-1~wheezy_amd64.deb \
1184-
$(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.9.0-1~jessie_amd64.deb
1212+
$(DEPS_DIR)/verify_package/debian-7/api-umbrella_0.10.0-1~wheezy_amd64.deb \
1213+
$(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.9.0-1~jessie_amd64.deb \
1214+
$(DEPS_DIR)/verify_package/debian-8/api-umbrella_0.10.0-1~jessie_amd64.deb
11851215

11861216
package:
11871217
$(BUILD_DIR)/package/build

‎build/verify_package/spec/localhost/service_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,4 +523,5 @@ def install_package(version)
523523
end
524524

525525
it_behaves_like "package upgrade", "0.9.0"
526+
it_behaves_like "package upgrade", "0.10.0"
526527
end

0 commit comments

Comments
 (0)