Merge pull request #4054 from edx/nedbat/ginkgo-updates

Vagrantfile changes to keep master in sync with Ginkgo.

vagrant/base/fullstack/Vagrantfile

@@ -21,6 +21,8 @@ VERSION_VARS = [
     'xqueue_version',
     'demo_version',
     'NOTIFIER_VERSION',
+    'INSIGHTS_VERSION',
+    'ANALYTICS_API_VERSION',
     'ECOMMERCE_VERSION',
     'ECOMMERCE_WORKER_VERSION',
     'DISCOVERY_VERSION',

vagrant/release/devstack/Vagrantfile

@@ -43,11 +43,17 @@ end
 # to a name and a file path, which are used for retrieving
 # a Vagrant box from the internet.
 openedx_releases = {
+  "open-release/ginkgo.master" => "ginkgo-devstack-2017-07-14",
+  "open-release/ginkgo.1rc1" => "ginkgo-devstack-2017-07-14",
+  "open-release/ginkgo.1" => "ginkgo-devstack-2017-07-14",
+
   "open-release/ficus.master" => "ficus-devstack-2017-02-07",
   "open-release/ficus.1rc1" => "ficus-devstack-2017-01-11",
   "open-release/ficus.1rc3" => "ficus-devstack-2017-02-07",
   "open-release/ficus.1rc4" => "ficus-devstack-2017-02-07",
   "open-release/ficus.1" => "ficus-devstack-2017-02-07",
+  "open-release/ficus.2" => "ficus-devstack-2017-02-07",
+  "open-release/ficus.3" => "ficus-devstack-2017-02-07",
 
   "open-release/eucalyptus.master" => "eucalyptus-devstack-2016-09-01",
   "open-release/eucalyptus.1rc2" => "eucalyptus-devstack-2016-08-19",
@@ -64,7 +70,7 @@ openedx_releases = {
   # Cypress is deprecated and unsupported
   # Birch is deprecated and unsupported
 }
-openedx_releases.default = "devstack-periodic-2017-06-19"
+openedx_releases.default = "ginkgo-devstack-2017-07-14"
 
 openedx_release = ENV['OPENEDX_RELEASE']
 boxname = ENV['OPENEDX_BOXNAME']

vagrant/release/fullstack/Vagrantfile

@@ -12,9 +12,14 @@ CPU_COUNT = 2
 # to a name and a file path, which are used for retrieving
 # a Vagrant box from the internet.
 openedx_releases = {
+  "open-release/ginkgo.1rc1" => "ginkgo-fullstack-2017-07-14",
+  "open-release/ginkgo.1" => "ginkgo-fullstack-2017-08-14",
+
   "open-release/ficus.1rc3" => "ficus-fullstack-2017-02-07",
   "open-release/ficus.1rc4" => "ficus-fullstack-2017-02-15",
   "open-release/ficus.1" => "ficus-fullstack-2017-02-15",
+  "open-release/ficus.2" => "ficus-fullstack-2017-03-28",
+  "open-release/ficus.3" => "ficus-fullstack-2017-04-20",
 
   "open-release/eucalyptus/1rc1" => "eucalyptus-fullstack-1rc1",
   "open-release/eucalyptus.1rc2" => "eucalyptus-fullstack-2016-08-19",
@@ -39,7 +44,7 @@ openedx_releases = {
   # Cypress is deprecated and unsupported
   # Birch is deprecated and unsupported
 }
-openedx_releases.default = "ficus-fullstack-2017-02-15"
+openedx_releases.default = "ginkgo-fullstack-2017-08-14"
 
 openedx_release = ENV['OPENEDX_RELEASE']
 boxname = ENV['OPENEDX_BOXNAME']