This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 79d27b79e83 Use self-hosted runner to run 1c3d IT and update the CI
workflow (#10474)
79d27b79e83 is described below
commit 79d27b79e83f94309ac7d7312c96a9dff2c7dc0d
Author: Haonan <hhao...@outlook.com>
AuthorDate: Fri Jul 7 20:35:02 2023 +0800
Use self-hosted runner to run 1c3d IT and update the CI workflow (#10474)
---
.github/workflows/cluster-it-1c1d.yml | 13 ++---
.github/workflows/cluster-it-1c3d.yml | 30 ++---------
.github/workflows/main-unix.yml | 66 -----------------------
.github/workflows/{main-win.yml => unit-test.yml} | 33 ++++++------
4 files changed, 26 insertions(+), 116 deletions(-)
diff --git a/.github/workflows/cluster-it-1c1d.yml
b/.github/workflows/cluster-it-1c1d.yml
index 1e6ff1c1047..81e0407d986 100644
--- a/.github/workflows/cluster-it-1c1d.yml
+++ b/.github/workflows/cluster-it-1c1d.yml
@@ -31,11 +31,8 @@ jobs:
fail-fast: false
max-parallel: 20
matrix:
- java: [ 8, 11, 17 ]
+ java: [11]
os: [ ubuntu-latest, windows-latest ]
- include:
- - java: 8
- os: macos-latest
runs-on: ${{ matrix.os }}
steps:
@@ -65,10 +62,10 @@ jobs:
if: ${{ runner.os == 'Linux' }}
shell: bash
run: sudo sysctl -w net.core.somaxconn=65535
- - name: Adjust Mac kernel somaxconn
- if: ${{ runner.os == 'macOS' }}
- shell: bash
- run: sudo sysctl -w kern.ipc.somaxconn=65535
+# - name: Adjust Mac kernel somaxconn
+# if: ${{ runner.os == 'macOS' }}
+# shell: bash
+# run: sudo sysctl -w kern.ipc.somaxconn=65535
- name: IT/UT Test
shell: bash
# we do not compile client-cpp for saving time, it is tested in
client.yml
diff --git a/.github/workflows/cluster-it-1c3d.yml
b/.github/workflows/cluster-it-1c3d.yml
index 6621856b92b..39db785d577 100644
--- a/.github/workflows/cluster-it-1c3d.yml
+++ b/.github/workflows/cluster-it-1c3d.yml
@@ -32,9 +32,9 @@ jobs:
max-parallel: 20
matrix:
java: [ 8, 11, 17 ]
- os: [ ubuntu-latest ]
- runs-on: ${{ matrix.os }}
-
+ runs-on: [self-hosted, iotdb]
+# group: self-hosted
+# labels: iotdb
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }}
@@ -42,30 +42,9 @@ jobs:
with:
distribution: liberica
java-version: ${{ matrix.java }}
- - name: Cache Maven packages
- uses: actions/cache@v3
- with:
- path: ~/.m2
- key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2-
- name: Check Apache Rat
- run: mvn -B apache-rat:check -P site -P code-coverage
- - name: Adjust network dynamic TCP ports range
- if: ${{ runner.os == 'Windows' }}
- shell: pwsh
run: |
- netsh int ipv4 set dynamicport tcp start=32768 num=32768
- netsh int ipv4 set dynamicport udp start=32768 num=32768
- netsh int ipv6 set dynamicport tcp start=32768 num=32768
- netsh int ipv6 set dynamicport udp start=32768 num=32768
- - name: Adjust Linux kernel somaxconn
- if: ${{ runner.os == 'Linux' }}
- shell: bash
- run: sudo sysctl -w net.core.somaxconn=65535
- - name: Adjust Mac kernel somaxconn
- if: ${{ runner.os == 'macOS' }}
- shell: bash
- run: sudo sysctl -w kern.ipc.somaxconn=65535
+ mvn -B apache-rat:check -P site -P code-coverage
- name: IT/UT Test
shell: bash
# we do not compile client-cpp for saving time, it is tested in
client.yml
@@ -73,6 +52,7 @@ jobs:
run: |
mvn clean verify \
-DskipUTs \
+ -DintegrationTest.forkCount=6 -DConfigNodeMaxHeapSize=1024
-DDataNodeMaxHeapSize=1024 \
-pl integration-test \
-am -PClusterIT
- name: Upload Artifact
diff --git a/.github/workflows/main-unix.yml b/.github/workflows/main-unix.yml
deleted file mode 100644
index 7842a473acb..00000000000
--- a/.github/workflows/main-unix.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see:
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Main Mac and Linux
-
-on:
- push:
- branches:
- - master
- - 'rel/*'
- - "new_*"
- paths-ignore:
- - 'docs/**'
- - 'site/**'
- pull_request:
- branches:
- - master
- - 'rel/*'
- - "new_*"
- paths-ignore:
- - 'docs/**'
- - 'site/**'
- # allow manually run the action:
- workflow_dispatch:
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-env:
- MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
-
-jobs:
- unix-ut:
- strategy:
- fail-fast: false
- max-parallel: 20
- matrix:
- java: [ 8, 11, 17 ]
- os: [ ubuntu-20.04 ]
- include:
- - java: 8
- os: macos-latest
- runs-on: ${{ matrix.os}}
-
- steps:
- - uses: actions/checkout@v3
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
- with:
- distribution: liberica
- java-version: ${{ matrix.java }}
- - name: Cache Maven packages
- uses: actions/cache@v3
- with:
- path: ~/.m2
- key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2-
- - name: Check Apache Rat
- run: mvn -B apache-rat:check -P site -P code-coverage
- - name: UT Test
- shell: bash
- # we do not compile client-cpp for saving time, it is tested in
client.yml
- run: |
- mvn clean install -DskipTests
- mvn -B clean test -Dtest.port.closed=true -P
get-jar-with-dependencies
diff --git a/.github/workflows/main-win.yml b/.github/workflows/unit-test.yml
similarity index 73%
rename from .github/workflows/main-win.yml
rename to .github/workflows/unit-test.yml
index c7c7fe8c7e3..a00ccab9888 100644
--- a/.github/workflows/main-win.yml
+++ b/.github/workflows/unit-test.yml
@@ -1,14 +1,13 @@
# This workflow will build a Java project with Maven
# For more information see:
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-name: Main Win
+name: Unit-Test
on:
push:
branches:
- master
- 'rel/*'
- - "new_*"
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -16,7 +15,6 @@ on:
branches:
- master
- 'rel/*'
- - "new_*"
paths-ignore:
- 'docs/**'
- 'site/**'
@@ -31,27 +29,29 @@ env:
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
jobs:
- win-ut:
+ unit-test:
strategy:
fail-fast: false
max-parallel: 20
matrix:
java: [ 8, 11, 17 ]
- # to reduce the CI time cost; we split the whole CI to 2 parts:
- # modules except the server:
- # -Diotdb.skip.test=true
- # the server module:
- # -pl server -am -DskipTests=true -Diotdb.test.only=true
- # but we just add labels here to make the action name more graceful
- it_task: [ 'others', 'server' ]
- runs-on: windows-latest
+ os: [ ubuntu-latest, windows-latest ]
+ it_task: [ 'others', 'datanode' ]
+ include:
+ - java: 17
+ os: macos-latest
+ it_task: 'datanode'
+ - java: 17
+ os: macos-latest
+ it_task: 'others'
+ runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
- distribution: liberica
+ distribution: corretto
java-version: ${{ matrix.java }}
- name: Cache Maven packages
uses: actions/cache@v3
@@ -60,10 +60,10 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2-
- name: Check Apache Rat
- run: mvn -B apache-rat:check
- - name: Test Server Module with Maven
+ run: mvn -B apache-rat:check -P site -P code-coverage
+ - name: Test Datanode Module with Maven
shell: bash
- if: ${{ matrix.it_task == 'server'}}
+ if: ${{ matrix.it_task == 'datanode'}}
run: mvn clean integration-test -Dtest.port.closed=true -pl
iotdb-core/datanode -am -DskipTests=true -Diotdb.test.only=true
- name: Test Other Modules with Maven
shell: bash
@@ -71,4 +71,3 @@ jobs:
run: |
mvn clean install -DskipTests
mvn clean test -Dtest.port.closed=true -Diotdb.test.skip=true -P
get-jar-with-dependencies
-
