From 9e29652a3738f93220d2db8f55605aadfc116138 Mon Sep 17 00:00:00 2001 From: Jianjie Liu Date: Thu, 2 Sep 2021 18:22:38 +0000 Subject: [PATCH 1/6] Try py37 --- .github/workflows/pr-gate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-gate.yml b/.github/workflows/pr-gate.yml index 16ea4111e7..739d70ce21 100644 --- a/.github/workflows/pr-gate.yml +++ b/.github/workflows/pr-gate.yml @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python: [3.6] + python: [3.6, 3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -115,7 +115,7 @@ jobs: matrix: os: [ubuntu-latest] java: [8] - python: [3.6] + python: [3.6, 3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -157,7 +157,7 @@ jobs: needs: static-analysis strategy: matrix: - python: [3.6] + python: [3.6, 3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html From c2825a5fecadab961bf3868258f577a166686938 Mon Sep 17 00:00:00 2001 From: Jianjie Liu Date: Thu, 7 Oct 2021 14:24:22 +0000 Subject: [PATCH 2/6] Use 3.7 as base py version --- .github/workflows/pr-gate.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-gate.yml b/.github/workflows/pr-gate.yml index 739d70ce21..d21f524f10 100644 --- a/.github/workflows/pr-gate.yml +++ b/.github/workflows/pr-gate.yml @@ -51,7 +51,7 @@ jobs: - name: Use Python 3.6 uses: actions/setup-python@v2 with: - python-version: 3.6 + python-version: 3.7 - name: Install dependencies (tox) run: | @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python: [3.6, 3.7] + python: [3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -115,7 +115,7 @@ jobs: matrix: os: [ubuntu-latest] java: [8] - python: [3.6, 3.7] + python: [3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -157,7 +157,7 @@ jobs: needs: static-analysis strategy: matrix: - python: [3.6, 3.7] + python: [3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -196,7 +196,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2.2.2 with: - python-version: '3.6' + python-version: 3.7 - name: Download coverage reports from all previous jobs uses: actions/download-artifact@v2 From c42fa54104bb0841835d8b026515b62e1130f3c9 Mon Sep 17 00:00:00 2001 From: Jianjie Liu Date: Thu, 7 Oct 2021 14:28:01 +0000 Subject: [PATCH 3/6] Run nightly on 3.6 & 3.7 --- .github/workflows/nightly.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7f87ab1220..338b6f49f2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -62,10 +62,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Use Python 3.6 + - name: Use Python 3.7 uses: actions/setup-python@v2 with: - python-version: 3.6 + python-version: 3.7 - name: Install dependencies (tox) run: | @@ -87,7 +87,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python: [3.6] + python: [3.6, 3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit', 'smoke'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -95,8 +95,8 @@ jobs: include: # Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory. # TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507) - - os: self-hosted - python: 3.6 + - os: [self-hosted, Linux] + python: [3.6, 3.7] test-kind: 'integration' test-marker: 'not spark and not gpu' @@ -136,7 +136,7 @@ jobs: matrix: os: [ubuntu-latest] java: [8] - python: [3.6] + python: [3.6, 3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit', 'smoke'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -144,9 +144,9 @@ jobs: include: # Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory. # TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507) - - os: self-hosted + - os: [self-hosted, Linux] java: 8 - python: 3.6 + python: [3.6, 3.7] test-kind: 'integration' test-marker: 'spark and not gpu' @@ -186,7 +186,7 @@ jobs: needs: static-analysis strategy: matrix: - python: [3.6] + python: [3.6, 3.7] # different kinds of tests are located in tests/ folders test-kind: ['unit', 'smoke', 'integration'] # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html @@ -225,7 +225,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2.2.2 with: - python-version: '3.6' + python-version: 3.7 - name: Download coverage reports from all previous jobs uses: actions/download-artifact@v2 From 53afdc407404231b1a5ae0f77cce274e88e9e309 Mon Sep 17 00:00:00 2001 From: Jianjie Liu Date: Thu, 7 Oct 2021 14:32:59 +0000 Subject: [PATCH 4/6] Run nightly build on dedicated machines --- .github/workflows/nightly.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 338b6f49f2..f7af3be005 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -95,7 +95,7 @@ jobs: include: # Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory. # TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507) - - os: [self-hosted, Linux] + - os: [self-hosted, Linux, nightly] python: [3.6, 3.7] test-kind: 'integration' test-marker: 'not spark and not gpu' @@ -144,8 +144,7 @@ jobs: include: # Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory. # TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507) - - os: [self-hosted, Linux] - java: 8 + - os: [self-hosted, Linux, nightly] python: [3.6, 3.7] test-kind: 'integration' test-marker: 'spark and not gpu' @@ -182,7 +181,7 @@ jobs: ################# GPU-BUILD ################# ############################################### build-gpu: - runs-on: [self-hosted, Linux, gpu] # this is a union of labels to select specific self-hosted machine + runs-on: [self-hosted, Linux, gpu, nightly] # this is a union of labels to select specific self-hosted machine needs: static-analysis strategy: matrix: From 1f3ba85bea06e408edfde4d54fbf8542e2ea74d1 Mon Sep 17 00:00:00 2001 From: Jianjie Liu Date: Thu, 7 Oct 2021 15:09:13 +0000 Subject: [PATCH 5/6] Rename a build step --- .github/workflows/nightly.yml | 2 +- .github/workflows/pr-gate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f7af3be005..b063d617bc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -62,7 +62,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Use Python 3.7 + - name: Setup Python uses: actions/setup-python@v2 with: python-version: 3.7 diff --git a/.github/workflows/pr-gate.yml b/.github/workflows/pr-gate.yml index d21f524f10..68ee0a0c80 100644 --- a/.github/workflows/pr-gate.yml +++ b/.github/workflows/pr-gate.yml @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Use Python 3.6 + - name: Setup Python uses: actions/setup-python@v2 with: python-version: 3.7 From 34f8b0a4fcb5f4baea56ebb0d5263c47b8ced58c Mon Sep 17 00:00:00 2001 From: Jianjie Liu Date: Fri, 8 Oct 2021 15:04:25 +0000 Subject: [PATCH 6/6] Edit manual trigger description --- .github/workflows/nightly.yml | 4 ++-- .github/workflows/pr-gate.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b063d617bc..7f76c331b7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -50,8 +50,8 @@ on: workflow_dispatch: input: tags: - description: 'Test scenario tags' - default: 'Anything to describe this manual run (optional)' + description: 'Tags to label this manual run (optional)' + default: 'Anything to describe this manual run' jobs: diff --git a/.github/workflows/pr-gate.yml b/.github/workflows/pr-gate.yml index 68ee0a0c80..fa9e16e49b 100644 --- a/.github/workflows/pr-gate.yml +++ b/.github/workflows/pr-gate.yml @@ -36,8 +36,8 @@ on: workflow_dispatch: input: tags: - description: 'Test scenario tags' - default: 'Anything to describe this manual run (optional)' + description: 'Tags to label this manual run (optional)' + default: 'Anything to describe this manual run' jobs: