diff options
| author | varac <varacanero@zeromail.org> | 2016-12-08 09:52:46 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-12-08 23:39:50 +0100 |
| commit | 3c4b29162e17960108a92ecc71274ecc4c9c3f76 (patch) | |
| tree | b0df8c7a885d3caafa2df50d270a8d460ea5c5a7 | |
| parent | ffd23f263d15ce04d1610e87abbdca3554dadd75 (diff) | |
Use webapp/nickserver:master on leap_platform:master (#8678)
| -rw-r--r-- | provider_base/common.json | 6 | ||||
| -rwxr-xr-x | tests/platform-ci/ci-build.sh | 3 | ||||
| -rw-r--r-- | tests/platform-ci/provider/common.json | 10 |
3 files changed, 4 insertions, 15 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index c6ab18d5..666fe923 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -71,11 +71,11 @@ "nickserver": { "type": "git", "source": "https://leap.se/git/nickserver", - "revision": "origin/version/0.9" + "revision": "origin/master" }, "platform": { "apt": { - "basic": "= 'http://deb.leap.se/' + Leap::Platform.major_version" + "basic": "http://deb.leap.se/experimental-platform" } }, "soledad": { @@ -86,7 +86,7 @@ "webapp": { "type": "git", "source": "https://leap.se/git/leap_web", - "revision": "origin/version/0.9" + "revision": "origin/master" } } } diff --git a/tests/platform-ci/ci-build.sh b/tests/platform-ci/ci-build.sh index 85557b3f..0dfbb5c3 100755 --- a/tests/platform-ci/ci-build.sh +++ b/tests/platform-ci/ci-build.sh @@ -43,8 +43,7 @@ NAME="citest${CI_BUILD_ID}" TAG='single' SERVICES='couchdb,soledad,mx,webapp,tor,monitor' -SEEDS='sources.platform.apt.basic:http://deb.leap.se/experimental-0.9 sources.webapp.revision:master sources.nickserver.revision:master' - +SEEDS='' # # Main diff --git a/tests/platform-ci/provider/common.json b/tests/platform-ci/provider/common.json index a13f8f75..2c63c085 100644 --- a/tests/platform-ci/provider/common.json +++ b/tests/platform-ci/provider/common.json @@ -1,12 +1,2 @@ { - "sources": { - "platform": { - "apt": { - "basic": "http://deb.leap.se/experimental-0.9" - } - }, - "nickserver": { - "revision": "develop" - } - } } |