all versions to 1.13.2

dcos · Jul 4, 2019 · fa45f5f · fa45f5f
1 parent 542f0a9
commit fa45f5f
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 71 deletions.
diff --git a/TESTING.MD b/TESTING.MD
@@ -27,7 +27,7 @@ CentOS current stable plus its EL variant (as per [Mesosphere version policy](ht
 
 ### iii. DC/OS version
 
-Following the [Mesosphere version policy](https://docs.mesosphere.com/version-policy/): 1.12, 1.11, 1.10 currently. Depending on release cycles, also the current beta version.
+Following the [Mesosphere version policy](https://docs.mesosphere.com/version-policy/): 1.13, 1.12, 1.11 currently. Depending on release cycles, also the current beta version.
 
 ### iv. DC/OS live cycle
 

diff --git a/group_vars/all/dcos.yaml.example b/group_vars/all/dcos.yaml.example
@@ -1,15 +1,14 @@
 ---
 dcos:
-  download: "https://downloads.dcos.io/dcos/stable/1.12.0/dcos_generate_config.sh"
-  version: "1.12.0"
-  # image_commit: "acc9fe548aea5b1b5b5858a4b9d2c96e07eeb9de"
+  download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+  version: "1.13.2"
   enterprise_dcos: false
 
   selinux_mode: permissive
 
   config:
     # This is a direct yaml representation of the DC/OS config.yaml
-    # Please see https://docs.mesosphere.com/1.12/installing/production/advanced-configuration/configuration-reference/
+    # Please see https://docs.mesosphere.com/1.13/installing/production/advanced-configuration/configuration-reference/
     # for parameter reference.
     cluster_name: "examplecluster"
     security: strict

diff --git a/molecule/default/idempotence.yml b/molecule/default/idempotence.yml
@@ -11,10 +11,9 @@
         name: DCOS.bootstrap
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -29,10 +28,9 @@
         name: DCOS.master
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -46,10 +44,9 @@
         name: DCOS.agent
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]

diff --git a/molecule/ec2/install_1-12_upgrade_1-12.yml → molecule/ec2/install_and_upgrade.yml b/molecule/ec2/install_1-12_upgrade_1-12.yml → molecule/ec2/install_and_upgrade.yml
@@ -59,9 +59,8 @@
         name: DCOS.bootstrap
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -75,9 +74,8 @@
         name: DCOS.master
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -90,9 +88,8 @@
         name: DCOS.agent
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
diff --git a/...e/ec2/same_version_config_update_1-12.yml → molecule/ec2/same_version_config_update.yml b/...e/ec2/same_version_config_update_1-12.yml → molecule/ec2/same_version_config_update.yml
@@ -13,10 +13,9 @@
         name: DCOS.bootstrap
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -31,10 +30,9 @@
         name: DCOS.master
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]
@@ -48,10 +46,9 @@
         name: DCOS.agent
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.default_ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.default_ipv4.address }}"]

diff --git a/molecule/ec2_centos7/molecule.yml b/molecule/ec2_centos7/molecule.yml
@@ -37,8 +37,8 @@ provisioner:
     ec2:
       create: ../ec2/create.yml
       destroy: ../ec2/destroy.yml
-    converge: ../ec2/same_version_config_update_1-12.yml
-    prepare: ../ec2/install_1-12_upgrade_1-12.yml
+    converge: ../ec2/same_version_config_update.yml
+    prepare: ../ec2/install_and_upgrade.yml
   config_options:
     defaults:
       hash_behaviour: merge

diff --git a/molecule/ec2_rhel7/molecule.yml b/molecule/ec2_rhel7/molecule.yml
@@ -34,8 +34,8 @@ provisioner:
     ec2:
       create: ../ec2/create.yml
       destroy: ../ec2/destroy.yml
-    converge: ../ec2/same_version_config_update_1-12.yml
-    prepare: ../ec2/install_1-12_upgrade_1-12.yml
+    converge: ../ec2/same_version_config_update.yml
+    prepare: ../ec2/install_and_upgrade.yml
   config_options:
     defaults:
       hash_behaviour: merge

diff --git a/...ant_centos7/install_1-12_upgrade_1-12.yml → ...ant_centos7/install_1-13_upgrade_1-13.yml b/...ant_centos7/install_1-12_upgrade_1-12.yml → ...ant_centos7/install_1-13_upgrade_1-13.yml
@@ -58,10 +58,9 @@
         name: DCOS.bootstrap
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.eth1.ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"]
@@ -75,10 +74,9 @@
         name: DCOS.master
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.eth1.ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"]
@@ -91,10 +89,9 @@
         name: DCOS.agent
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.eth1.ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"]
diff --git a/molecule/vagrant_centos7/molecule.yml b/molecule/vagrant_centos7/molecule.yml
@@ -47,8 +47,8 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    converge: same_version_config_update_1-12.yml
-    prepare: install_1-12_upgrade_1-12.yml
+    converge: same_version_config_update.yml
+    prepare: install_and_upgrade.yml
   config_options:
     defaults:
       hash_behaviour: merge

diff --git a/...ntos7/same_version_config_update_1-12.yml → ...ntos7/same_version_config_update_1-13.yml b/...ntos7/same_version_config_update_1-12.yml → ...ntos7/same_version_config_update_1-13.yml
@@ -13,10 +13,9 @@
         name: DCOS.bootstrap
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.eth1.ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"]
@@ -31,10 +30,9 @@
         name: DCOS.master
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.eth1.ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"]
@@ -48,10 +46,9 @@
         name: DCOS.agent
   vars:
     dcos:
-      download: "https://downloads.dcos.io/dcos/testing/1.12/commit/3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623/dcos_generate_config.sh"
-      version: "1.12.0"
-      version_to_upgrade_from: "1.12.0"
-      image_commit: "3b8b3837cd12bdbc0853e5cd9e0d635b8ba83623"
+      download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+      version: "1.13.2"
+      version_to_upgrade_from: "1.13.2"
       config:
         bootstrap_url: "http://{{ hostvars[groups['bootstraps'][0]].ansible_facts.eth1.ipv4.address }}:8080"
         master_list: ["{{ hostvars[groups['masters'][0]].ansible_facts.eth1.ipv4.address }}"]

diff --git a/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/molecule.yml b/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/molecule.yml
@@ -22,8 +22,8 @@ provisioner:
         cluster_name_confirmed: true
         cluster_name: "moleculecentos75"
         dcos:
-          download: "https://downloads.dcos.io/dcos/EarlyAccess/dcos_generate_config.sh"
-          version: "1.12.0-beta1"
+          download: "https://downloads.dcos.io/dcos/stable/1.13.2/dcos_generate_config.sh"
+          version: "1.13.2"
           enterprise_dcos: false
           selinux_mode: enforcing
           config:

diff --git a/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/tests/test_default.py b/roles/DCOS.bootstrap/molecule/bootstrap_need_prereqs/tests/test_default.py
@@ -13,6 +13,6 @@ def test_docker_running_and_enabled(host):
 def test_docker_serves_bootstrap_files(host):
     # TODO: get nodes config in here somehow and make uri dynamic
     cmd = host.run(
-        "curl -I http://localhost:8080/1.12.0-beta1/genconf/serve/bootstrap.latest")
+        "curl -I http://localhost:8080/1.13.2/genconf/serve/bootstrap.latest")
     assert cmd.rc == 0
     assert '200 OK' in cmd.stdout