Merge pull request #484 from mesosphere/fix-#480

default to universe version-2.x during install
dcos · Feb 22, 2016 · ff45e21 · ff45e21
2 parents b8a9395 + 4402581
commit ff45e21
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/README.rst b/README.rst
@@ -96,7 +96,7 @@ Configure Environment and Run
    installation of DCOS::
 
     dcos config set core.dcos_url http://dcos-ea-1234.us-west-2.elb.amazonaws.com
-    dcos config append package.sources https://github.com/mesosphere/universe/archive/version-1.x.zip
+    dcos config append package.sources https://universe.mesosphere.com/repo
     dcos config set package.cache /tmp/dcos
     dcos package update
 

diff --git a/bin/install/install-dcos-cli.sh b/bin/install/install-dcos-cli.sh
@@ -114,7 +114,7 @@ dcos config set core.dcos_url $DCOS_URL
 dcos config set core.ssl_verify false
 dcos config set core.timeout 5
 dcos config set package.cache ~/.dcos/cache
-dcos config set package.sources '["https://github.com/mesosphere/universe/archive/version-1.x.zip"]'
+dcos config set package.sources '["https://universe.mesosphere.com/repo"]'
 dcos package update
 
 ADD_PATH=""

diff --git a/bin/install/install-optout-dcos-cli.sh b/bin/install/install-optout-dcos-cli.sh
@@ -115,7 +115,7 @@ dcos config set core.dcos_url $DCOS_URL
 dcos config set core.ssl_verify false
 dcos config set core.timeout 5
 dcos config set package.cache ~/.dcos/cache
-dcos config set package.sources '["https://github.com/mesosphere/universe/archive/version-1.x.zip"]'
+dcos config set package.sources '["https://universe.mesosphere.com/repo"]'
 dcos package update
 
 ADD_PATH=""

diff --git a/cli/tests/integrations/test_config.py b/cli/tests/integrations/test_config.py
@@ -180,24 +180,24 @@ def test_prepend_empty_list(env):
 def test_append_list(env):
     _append_value(
         'package.sources',
-        'https://github.com/mesosphere/universe/archive/version-2.x.zip',
+        'https://universe.mesosphere.com/repo',
         env)
     _get_value(
         'package.sources',
         ['https://github.com/mesosphere/universe/archive/cli-test-3.zip',
-         'https://github.com/mesosphere/universe/archive/version-2.x.zip'],
+         'https://universe.mesosphere.com/repo'],
         env)
     config_unset('package.sources', '1', env)
 
 
 def test_prepend_list(env):
     _prepend_value(
         'package.sources',
-        'https://github.com/mesosphere/universe/archive/version-2.x.zip',
+        'https://universe.mesosphere.com/repo',
         env)
     _get_value(
         'package.sources',
-        ['https://github.com/mesosphere/universe/archive/version-2.x.zip',
+        ['https://universe.mesosphere.com/repo',
          'https://github.com/mesosphere/universe/archive/cli-test-3.zip'],
         env)
     config_unset('package.sources', '0', env)

diff --git a/win_bin/install/install-dcos-cli.ps1 b/win_bin/install/install-dcos-cli.ps1
@@ -104,7 +104,7 @@ dcos config set core.reporting true
 dcos config set core.dcos_url $dcos_url
 dcos config set core.timeout 5
 dcos config set package.cache $env:temp\dcos\package-cache
-dcos config set package.sources '[\"https://github.com/mesosphere/universe/archive/version-1.x.zip\"]'
+dcos config set package.sources '[\"https://universe.mesosphere.com/repo\"]'
 
 dcos package update