From b52aeeabfad6cac74f64c168bc4b305bcc6e4261 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 16 Aug 2017 10:55:19 -0700 Subject: [PATCH] Roadmap updates and docs fix. (#28287) * Update on 2.4 roadmap progress. * Fix docs syntax for Python 2. --- .../rst/dev_guide/testing/sanity/no-wildcard-import.rst | 4 ++-- docs/docsite/rst/roadmap/ROADMAP_2_4.rst | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/docsite/rst/dev_guide/testing/sanity/no-wildcard-import.rst b/docs/docsite/rst/dev_guide/testing/sanity/no-wildcard-import.rst index 1cda220ebc9..3fd59e271e6 100644 --- a/docs/docsite/rst/dev_guide/testing/sanity/no-wildcard-import.rst +++ b/docs/docsite/rst/dev_guide/testing/sanity/no-wildcard-import.rst @@ -15,7 +15,7 @@ Examples of unfixed code: do_something(variable) from ansible.module_utils.basic import * - module = AnsibleModule([...]) + module = AnsibleModule() Examples of fixed code: @@ -26,4 +26,4 @@ Examples of fixed code: do_something(variable) from ansible.module_utils.basic import AnsibleModule - module = AnsibleModule([...]) + module = AnsibleModule() diff --git a/docs/docsite/rst/roadmap/ROADMAP_2_4.rst b/docs/docsite/rst/roadmap/ROADMAP_2_4.rst index 0e338588af9..595acb2e245 100644 --- a/docs/docsite/rst/roadmap/ROADMAP_2_4.rst +++ b/docs/docsite/rst/roadmap/ROADMAP_2_4.rst @@ -215,7 +215,7 @@ Contributor Quality of Life - Originally enabled during the 2.3 release cycle, but later disabled due to intermittent WinRM issues. - Depends on resolution of WinRM connection issues. - - Windows Server Nano Integration Tests + - Windows Server Nano Integration Tests **(pushed to future roadmap)** - Add support to ansible-core-ci for Windows Server 2016 Nano and enable on Shippable. - This will use a subset of the existing Windows integration tests. @@ -230,9 +230,9 @@ Contributor Quality of Life - Run existing cloud integration tests as part of CI for: - - AWS **(done, some tests excluded due to test duration)** - - Azure **(in progress)** - - GCP as part of CI. **(possibly pushed to future roadmap)** + - AWS **(done)** + - Azure **(done)** + - GCP **(pushed to future roadmap)** - Tests to be run only on cloud module (and module_utils) PRs and merges for the relevant cloud provider. **(done)**