From 49351b08d5fd3a333c7cf32cfbf4f50ee84c50f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= Date: Fri, 11 Dec 2020 16:55:28 +0100 Subject: [PATCH] Gentoo - disable x.0 version tests. --- .github/workflows/main-branch-only.yml | 224 +++--------------------- .github/workflows/templates/generate.py | 8 +- .kitchen.yml | 4 + 3 files changed, 30 insertions(+), 206 deletions(-) diff --git a/.github/workflows/main-branch-only.yml b/.github/workflows/main-branch-only.yml index d04e1bc..b1e9564 100644 --- a/.github/workflows/main-branch-only.yml +++ b/.github/workflows/main-branch-only.yml @@ -11,7 +11,7 @@ jobs: py3-stable-2019-2-gentoo: name: Gentoo v2019.2 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -57,7 +57,7 @@ jobs: py3-git-2019-2-gentoo: name: Gentoo v2019.2 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -103,7 +103,7 @@ jobs: py3-stable-3000-gentoo: name: Gentoo v3000 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -149,7 +149,7 @@ jobs: py3-git-3000-gentoo: name: Gentoo v3000 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -195,7 +195,7 @@ jobs: py3-stable-3001-gentoo: name: Gentoo v3001 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -241,7 +241,7 @@ jobs: py3-git-3001-gentoo: name: Gentoo v3001 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -284,56 +284,10 @@ jobs: bundle exec kitchen destroy py3-git-3001-gentoo - py3-stable-3001-0-gentoo: - name: Gentoo v3001.0 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 50 - - - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3001-0-gentoo || bundle exec kitchen create py3-stable-3001-0-gentoo - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3001-0-gentoo - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3001-0-gentoo - - py3-stable-3002-gentoo: name: Gentoo v3002 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -379,7 +333,7 @@ jobs: py3-git-3002-gentoo: name: Gentoo v3002 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -422,56 +376,10 @@ jobs: bundle exec kitchen destroy py3-git-3002-gentoo - py3-stable-3002-0-gentoo: - name: Gentoo v3002.0 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 50 - - - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-0-gentoo || bundle exec kitchen create py3-stable-3002-0-gentoo - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-0-gentoo - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-0-gentoo - - py3-git-master-gentoo: name: Gentoo Master Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -517,7 +425,7 @@ jobs: latest-gentoo: name: Gentoo Latest packaged release runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -563,7 +471,7 @@ jobs: py3-stable-2019-2-gentoo-systemd: name: Gentoo (systemd) v2019.2 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -609,7 +517,7 @@ jobs: py3-git-2019-2-gentoo-systemd: name: Gentoo (systemd) v2019.2 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -655,7 +563,7 @@ jobs: py3-stable-3000-gentoo-systemd: name: Gentoo (systemd) v3000 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -701,7 +609,7 @@ jobs: py3-git-3000-gentoo-systemd: name: Gentoo (systemd) v3000 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -747,7 +655,7 @@ jobs: py3-stable-3001-gentoo-systemd: name: Gentoo (systemd) v3001 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -793,7 +701,7 @@ jobs: py3-git-3001-gentoo-systemd: name: Gentoo (systemd) v3001 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -836,56 +744,10 @@ jobs: bundle exec kitchen destroy py3-git-3001-gentoo-systemd - py3-stable-3001-0-gentoo-systemd: - name: Gentoo (systemd) v3001.0 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 50 - - - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3001-0-gentoo-systemd || bundle exec kitchen create py3-stable-3001-0-gentoo-systemd - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3001-0-gentoo-systemd - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3001-0-gentoo-systemd - - py3-stable-3002-gentoo-systemd: name: Gentoo (systemd) v3002 Py3 Stable runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -931,7 +793,7 @@ jobs: py3-git-3002-gentoo-systemd: name: Gentoo (systemd) v3002 Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -974,56 +836,10 @@ jobs: bundle exec kitchen destroy py3-git-3002-gentoo-systemd - py3-stable-3002-0-gentoo-systemd: - name: Gentoo (systemd) v3002.0 Py3 Stable - runs-on: ubuntu-latest - timeout-minutes: 50 - - - - steps: - - uses: actions/checkout@v1 - - name: Setup Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - - - name: Install Bundler - run: | - gem install bundler - - - name: Setup Bundle - run: | - bundle install --with docker --without opennebula ec2 windows vagrant - - - name: Set up Python 3.7 - uses: actions/setup-python@v1 - with: - python-version: 3.7 - - - name: Install Python Dependencies - run: | - pip install -U pip - pip install -r tests/requirements.txt - - - name: Create Test Container - run: | - bundle exec kitchen create py3-stable-3002-0-gentoo-systemd || bundle exec kitchen create py3-stable-3002-0-gentoo-systemd - - - name: Test Bootstrap In Test Container - run: | - bundle exec kitchen verify py3-stable-3002-0-gentoo-systemd - - - name: Destroy Test Container - if: always() - run: | - bundle exec kitchen destroy py3-stable-3002-0-gentoo-systemd - - py3-git-master-gentoo-systemd: name: Gentoo (systemd) Master Py3 Git runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 @@ -1069,7 +885,7 @@ jobs: latest-gentoo-systemd: name: Gentoo (systemd) Latest packaged release runs-on: ubuntu-latest - timeout-minutes: 50 + timeout-minutes: 70 diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index 8036336..f3bb1b4 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -76,10 +76,14 @@ BLACKLIST_3001 = [ BLACKLIST_3001_0 = [ "debian-11", + "gentoo", + "gentoo-systemd", ] BLACKLIST_3002_0 = [ "debian-11", + "gentoo", + "gentoo-systemd", ] SALT_BRANCHES = [ @@ -131,8 +135,8 @@ DISTRO_DISPLAY_NAMES = { TIMEOUT_DEFAULT = 20 TIMEOUT_OVERRIDES = { - "gentoo": 50, - "gentoo-systemd": 50, + "gentoo": 70, + "gentoo-systemd": 70, } BRANCH_ONLY_OVERRIDES = [ "gentoo", diff --git a/.kitchen.yml b/.kitchen.yml index 7bf537b..ef18b9a 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -231,6 +231,8 @@ suites: - fedora-32 - fedora-33 - arch + - gentoo + - gentoo-systemd - name: py3-stable-3001 provisioner: salt_version: 3001 @@ -251,6 +253,8 @@ suites: - fedora-32 - fedora-33 - arch + - gentoo + - gentoo-systemd - name: py3-stable-3002 provisioner: salt_version: 3002