From 0ff780cc362cb07f05b83d998f7cba835bea3796 Mon Sep 17 00:00:00 2001
From: John R Barker <john@johnrbarker.com>
Date: Mon, 9 Mar 2020 14:09:08 +0000
Subject: [PATCH] Update Galaxy paths (#2)

* Update Galaxy paths
---
 .github/settings.yml                          |  61 ++++
 .../collection-continuous-integration.yml     | 308 ------------------
 galaxy.yml                                    |  34 +-
 3 files changed, 78 insertions(+), 325 deletions(-)
 create mode 100644 .github/settings.yml
 delete mode 100644 .github/workflows/collection-continuous-integration.yml

diff --git a/.github/settings.yml b/.github/settings.yml
new file mode 100644
index 0000000000..78bacc47a0
--- /dev/null
+++ b/.github/settings.yml
@@ -0,0 +1,61 @@
+###
+# https://probot.github.io/apps/settings/
+#
+
+# DO NOT MODIFY
+# this is a copy of https://github.com/gundalow-collection/.github/blob/master/.github/settings.yml
+# Work around till https://github.com/probot/settings/pull/179 is merged
+
+
+
+repository:
+  # See https://developer.github.com/v3/repos/#edit for all available settings.
+  has_issues: true
+  has_wiki: false
+  has_pages: false
+  default_branch: master
+  allow_squash_merge: true
+  allow_merge_commit: false
+  allow_rebase_merge: true
+
+# Labels: define labels for Issues and Pull Requests
+labels:
+  - name: bug
+    color: fbca04
+    description: This issue/PR relates to a bug.
+  - name: feature
+    description: This issue/PR relates to a feature request.
+    color: 006b75
+  - name: migrated_from_ansible_ansible
+    color: 5319e7
+    description: This issue/PR was moved from gh/ansible/ansible
+
+branches:
+  - name: master
+    # https://developer.github.com/v3/repos/branches/#update-branch-protection
+    # Branch Protection settings. Set to null to disable
+    protection:
+      # Required. Require at least one approving review on a pull request, before merging. Set to null to disable.
+      required_pull_request_reviews:
+        # The number of approvals required. (1-6)
+        required_approving_review_count: 1
+        # Dismiss approved reviews automatically when a new commit is pushed.
+        dismiss_stale_reviews: true
+        # Blocks merge until code owners have reviewed.
+        require_code_owner_reviews: true
+        # Specify which users and teams can dismiss pull request reviews. Pass an empty dismissal_restrictions object to disable. User and team dismissal_restrictions are only available for organization-owned repositories. Omit this parameter for personal repositories.
+        dismissal_restrictions:
+          users: []
+          teams: []
+      # Required. Require status checks to pass before merging. Set to null to disable
+      required_status_checks:
+        # Required. Require branches to be up to date before merging.
+        strict: true
+        # Required. The list of status checks to require in order to merge into this branch
+        contexts: []
+      # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
+      enforce_admins: true
+      # Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
+      #restrictions:
+      #  users: []
+      #  teams: []
diff --git a/.github/workflows/collection-continuous-integration.yml b/.github/workflows/collection-continuous-integration.yml
deleted file mode 100644
index dfc285be4f..0000000000
--- a/.github/workflows/collection-continuous-integration.yml
+++ /dev/null
@@ -1,308 +0,0 @@
-name: Collection test suite
-
-on:
-  push:
-  pull_request:
-  schedule:
-  - cron: 3 0 * * *  # Run daily at 0:03 UTC
-
-jobs:
-  build-collection-artifact:
-    name: Build collection
-    runs-on: ${{ matrix.runner-os }}
-    strategy:
-      matrix:
-        runner-os:
-        - ubuntu-latest
-        ansible-version:
-        - git+https://github.com/ansible/ansible.git@devel
-        runner-python-version:
-        - 3.8
-    steps:
-    - name: Check out ${{ github.repository }} on disk
-      uses: actions/checkout@master
-    - name: Set up Python ${{ matrix.runner-python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.runner-python-version }}
-    - name: Set up pip cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('tests/sanity/requirements.txt') }}-${{ hashFiles('tests/unit/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-    - name: Install Ansible ${{ matrix.ansible-version }}
-      run: >-
-        python -m
-        pip
-        install
-        --user
-        ${{ matrix.ansible-version }}
-    - name: Build a collection tarball
-      run: >-
-        ~/.local/bin/ansible-galaxy
-        collection
-        build
-        --output-path
-        "${GITHUB_WORKSPACE}/.cache/collection-tarballs"
-    - name: Store migrated collection artifacts
-      uses: actions/upload-artifact@v1
-      with:
-        name: >-
-          collection
-        path: .cache/collection-tarballs
-
-  sanity-test-collection-via-vms:
-    name: Sanity in VM ${{ matrix.os.vm || 'ubuntu-latest' }}
-    needs:
-    - build-collection-artifact
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ansible-version:
-        - git+https://github.com/ansible/ansible.git@devel
-        os:
-        - vm: ubuntu-latest
-        - vm: ubuntu-16.04
-        - vm: macos-latest
-        python-version:
-        - 3.8
-        - 3.7
-        - 3.6
-        - 3.5
-        - 2.7
-    steps:
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Set up pip cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ github.ref }}-sanity-VMs
-        restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-    - name: Install Ansible ${{ matrix.ansible-version }}
-      run: >-
-        python -m
-        pip
-        install
-        --user
-        ${{ matrix.ansible-version }}
-    - name: Download migrated collection artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: >-
-          collection
-        path: .cache/collection-tarballs
-    - name: Install the collection tarball
-      run: >-
-        ~/.local/bin/ansible-galaxy
-        collection
-        install
-        .cache/collection-tarballs/*.tar.gz
-    - name: Run collection sanity tests
-      run: >-
-        ~/.local/bin/ansible-test
-        sanity
-        --color
-        --requirements
-        --venv
-        --python
-        "${{ matrix.python-version }}"
-        -vvv
-      working-directory: >-
-        /${{ runner.os == 'Linux' && 'home' || 'Users' }}/runner/.ansible/collections/ansible_collections/community/general
-
-  sanity-test-collection-via-containers:
-    name: Sanity in container via Python ${{ matrix.python-version }}
-    needs:
-    - build-collection-artifact
-    runs-on: ${{ matrix.runner-os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner-os:
-        - ubuntu-latest
-        runner-python-version:
-        - 3.8
-        ansible-version:
-        - git+https://github.com/ansible/ansible.git@devel
-        python-version:
-        - 3.8
-        - 2.7
-        - 3.7
-        - 3.6
-        - 3.5
-        - 2.6
-    steps:
-    - name: Set up Python ${{ matrix.runner-python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.runner-python-version }}
-    - name: Set up pip cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ github.ref }}-sanity-containers
-        restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-    - name: Install Ansible ${{ matrix.ansible-version }}
-      run: >-
-        python -m
-        pip
-        install
-        --user
-        ${{ matrix.ansible-version }}
-    - name: Download migrated collection artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: >-
-          collection
-        path: .cache/collection-tarballs
-    - name: Install the collection tarball
-      run: >-
-        ~/.local/bin/ansible-galaxy
-        collection
-        install
-        .cache/collection-tarballs/*.tar.gz
-    - name: Run collection sanity tests
-      run: >-
-        ~/.local/bin/ansible-test
-        sanity
-        --color
-        --requirements
-        --docker
-        --python
-        "${{ matrix.python-version }}"
-        -vvv
-      working-directory: >-
-        /home/runner/.ansible/collections/ansible_collections/community/general
-
-  unit-test-collection-via-vms:
-    name: Units in VM ${{ matrix.os.vm || 'ubuntu-latest' }}
-    needs:
-    - build-collection-artifact
-    runs-on: ${{ matrix.os.vm || 'ubuntu-latest' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ansible-version:
-        - git+https://github.com/ansible/ansible.git@devel
-        os:
-        - vm: ubuntu-latest
-        - vm: ubuntu-16.04
-        - vm: macos-latest
-        python-version:
-        - 3.8
-        - 3.7
-        - 3.6
-        - 3.5
-        - 2.7
-    steps:
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Set up pip cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ github.ref }}-units-VMs
-        restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-    - name: Install Ansible ${{ matrix.ansible-version }}
-      run: >-
-        python -m
-        pip
-        install
-        --user
-        ${{ matrix.ansible-version }}
-    - name: Download migrated collection artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: >-
-          collection
-        path: .cache/collection-tarballs
-    - name: Install the collection tarball
-      run: >-
-        ~/.local/bin/ansible-galaxy
-        collection
-        install
-        .cache/collection-tarballs/*.tar.gz
-    - name: Run collection unit tests
-      run: |
-        [[ ! -d 'tests/unit' ]] && echo This collection does not have unit tests. Skipping... || \
-        ~/.local/bin/ansible-test units --color --coverage --requirements --venv --python "${{ matrix.python-version }}" -vvv
-      working-directory: >-
-        /${{ runner.os == 'Linux' && 'home' || 'Users' }}/runner/.ansible/collections/ansible_collections/community/general
-
-  unit-test-collection-via-containers:
-    name: Units in container ${{ matrix.container-image }}
-    needs:
-    - build-collection-artifact
-    runs-on: ${{ matrix.runner-os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        runner-os:
-        - ubuntu-latest
-        runner-python-version:
-        - 3.8
-        ansible-version:
-        - git+https://github.com/ansible/ansible.git@devel
-        container-image:
-        - fedora31
-        - ubuntu1804
-        - centos8
-        - opensuse15
-        - fedora30
-        - centos7
-        - opensuse15py2
-        - ubuntu1604
-        - centos6
-    steps:
-    - name: Set up Python ${{ matrix.runner-python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.runner-python-version }}
-    - name: Set up pip cache
-      uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ github.ref }}-units-containers
-        restore-keys: |
-          ${{ runner.os }}-pip-
-          ${{ runner.os }}-
-    - name: Install Ansible ${{ matrix.ansible-version }}
-      run: >-
-        python -m
-        pip
-        install
-        --user
-        ${{ matrix.ansible-version }}
-    - name: Download migrated collection artifacts
-      uses: actions/download-artifact@v1
-      with:
-        name: >-
-          collection
-        path: .cache/collection-tarballs
-    - name: Install the collection tarball
-      run: >-
-        ~/.local/bin/ansible-galaxy
-        collection
-        install
-        .cache/collection-tarballs/*.tar.gz
-    - name: Run collection unit tests
-      run: |
-        [[ ! -d 'tests/unit' ]] && echo This collection does not have unit tests. Skipping... || \
-        ~/.local/bin/ansible-test units --color --coverage --requirements --docker "${{ matrix.container-image }}" -vvv
-      working-directory: >-
-        /home/runner/.ansible/collections/ansible_collections/community/general
\ No newline at end of file
diff --git a/galaxy.yml b/galaxy.yml
index a707a25e66..d45e1d710a 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -7,22 +7,22 @@ description: null
 license: GPL-3.0-or-later
 license_file: COPYING
 tags: null
-dependencies:
-  netapp.ontap: '>=0.1.0'
-  community.kubernetes: '>=0.1.0'
-  ovirt.ovirt: '>=0.1.0'
-  ansible.netcommon: '>=0.1.0'
-  cisco.mso: '>=0.1.0'
-  ansible.posix: '>=0.1.0'
-  cisco.aci: '>=0.1.0'
-  cisco.intersight: '>=0.1.0'
-  check_point.mgmt: '>=0.1.0'
-  fortinet.fortios: '>=0.1.0'
-  openstack.cloud: '>=0.1.0'
-  google.cloud: '>=0.1.0'
-  f5networks.f5_modules: '>=0.1.0'
-repository: git@github.com:ansible-collection-migration/community.general.git
+#dependencies:
+#  netapp.ontap: '>=0.1.0'
+#  community.kubernetes: '>=0.1.0'
+#  ovirt.ovirt: '>=0.1.0'
+#  ansible.netcommon: '>=0.1.0'
+#  cisco.mso: '>=0.1.0'
+#  ansible.posix: '>=0.1.0'
+#  cisco.aci: '>=0.1.0'
+#  cisco.intersight: '>=0.1.0'
+#  check_point.mgmt: '>=0.1.0'
+#  fortinet.fortios: '>=0.1.0'
+#  openstack.cloud: '>=0.1.0'
+#  google.cloud: '>=0.1.0'
+#  f5networks.f5_modules: '>=0.1.0'
+repository: https://github.com/ansible-collections/community.general
 documentation: https://github.com/ansible-collection-migration/community.general/tree/master/docs
-homepage: https://github.com/ansible-collection-migration/community.general
-issues: https://github.com/ansible-collection-migration/community.general/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc
+homepage: https://github.com/ansible-collections/community.general
+issues: https://github.com/ansible-collections/community.general/issues
 type: flatmap