From fa45f5fffa9e9f22309b069d3a15b477247fb1ff Mon Sep 17 00:00:00 2001 From: Sebastian Brandt <793580+sebbrandt87@users.noreply.github.com> Date: Thu, 4 Jul 2019 20:30:22 +0200 Subject: [PATCH] all versions to 1.13.2 --- TESTING.MD | 2 +- group_vars/all/dcos.yaml.example | 7 +++---- molecule/default/idempotence.yml | 21 ++++++++----------- ...grade_1-12.yml => install_and_upgrade.yml} | 15 ++++++------- ...-12.yml => same_version_config_update.yml} | 21 ++++++++----------- molecule/ec2_centos7/molecule.yml | 4 ++-- molecule/ec2_rhel7/molecule.yml | 4 ++-- ...1-12.yml => install_1-13_upgrade_1-13.yml} | 21 ++++++++----------- molecule/vagrant_centos7/molecule.yml | 4 ++-- ...ml => same_version_config_update_1-13.yml} | 21 ++++++++----------- .../bootstrap_need_prereqs/molecule.yml | 4 ++-- .../tests/test_default.py | 2 +- 12 files changed, 55 insertions(+), 71 deletions(-) rename molecule/ec2/{install_1-12_upgrade_1-12.yml => install_and_upgrade.yml} (79%) rename molecule/ec2/{same_version_config_update_1-12.yml => same_version_config_update.yml} (64%) rename molecule/vagrant_centos7/{install_1-12_upgrade_1-12.yml => install_1-13_upgrade_1-13.yml} (76%) rename molecule/vagrant_centos7/{same_version_config_update_1-12.yml => same_version_config_update_1-13.yml} (63%) diff --git a/TESTING.MD b/TESTING.MD index 4fbdbd19..f13cd808 100644 --- 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 index d2fb24dd..da817e3f 100755 --- 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 index dba3b9b6..35b91fb5 100644 --- 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 b/molecule/ec2/install_and_upgrade.yml similarity index 79% rename from molecule/ec2/install_1-12_upgrade_1-12.yml rename to molecule/ec2/install_and_upgrade.yml index 218b8c19..f770ef04 100644 --- a/molecule/ec2/install_1-12_upgrade_1-12.yml +++ b/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/molecule/ec2/same_version_config_update_1-12.yml b/molecule/ec2/same_version_config_update.yml similarity index 64% rename from molecule/ec2/same_version_config_update_1-12.yml rename to molecule/ec2/same_version_config_update.yml index e1741b89..748a07d3 100644 --- a/molecule/ec2/same_version_config_update_1-12.yml +++ b/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 index 21a1843b..6f322859 100644 --- 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 index 69ffa2af..4622f8e9 100644 --- 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/molecule/vagrant_centos7/install_1-12_upgrade_1-12.yml b/molecule/vagrant_centos7/install_1-13_upgrade_1-13.yml similarity index 76% rename from molecule/vagrant_centos7/install_1-12_upgrade_1-12.yml rename to molecule/vagrant_centos7/install_1-13_upgrade_1-13.yml index f217375b..95034f6d 100644 --- a/molecule/vagrant_centos7/install_1-12_upgrade_1-12.yml +++ b/molecule/vagrant_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 index 67a7c07d..faca65ac 100644 --- 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/molecule/vagrant_centos7/same_version_config_update_1-12.yml b/molecule/vagrant_centos7/same_version_config_update_1-13.yml similarity index 63% rename from molecule/vagrant_centos7/same_version_config_update_1-12.yml rename to molecule/vagrant_centos7/same_version_config_update_1-13.yml index 494f68db..8f378eb2 100644 --- a/molecule/vagrant_centos7/same_version_config_update_1-12.yml +++ b/molecule/vagrant_centos7/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 index 97d18f13..9ec430f5 100644 --- 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 index 29f2d5c7..9ce87409 100644 --- 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