This is an automated email from the ASF dual-hosted git repository.
ckj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new f725149a [#580] chore: move deploy/kubernetes to a standalone workflow
(#578)
f725149a is described below
commit f725149a326ca728310fcea7c888d1149b3549aa
Author: Kaijie Chen <[email protected]>
AuthorDate: Mon Feb 13 16:28:14 2023 +0800
[#580] chore: move deploy/kubernetes to a standalone workflow (#578)
### What changes were proposed in this pull request?
1. Move `kubernetes` profile from `parallel.yml` to a standalone workflow.
2. Speed up `kubernetes` workflow by skipping java tests.
### Why are the changes needed?
Sub-task of #580
1. Cleanup regular CI `parallel.yml`.
2. Speed up `kubernetes` CI.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
CI.
---
.github/workflows/build.yml | 5 +++++
.github/workflows/{parallel.yml => deploy.yml} | 22 +++++-----------------
.github/workflows/parallel.yml | 12 ------------
deploy/kubernetes/pom.xml | 1 +
pom.xml | 3 +++
5 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3490477..d7b9579a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,3 +64,8 @@ jobs:
with:
maven-args: package
reports-path: "**/target/surefire-reports/*.txt"
+
+ deploy:
+ uses: ./.github/workflows/deploy.yml
+ with:
+ maven-args: package
diff --git a/.github/workflows/parallel.yml b/.github/workflows/deploy.yml
similarity index 84%
copy from .github/workflows/parallel.yml
copy to .github/workflows/deploy.yml
index 7ae4d48b..803de485 100644
--- a/.github/workflows/parallel.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-name: All Profiles in Parallel
+name: All Deploy Profiles in Parallel
on:
workflow_call:
@@ -49,25 +49,15 @@ on:
type: string
jobs:
- maven:
+ package:
runs-on: ubuntu-20.04
strategy:
matrix:
profile:
- - spark2
- - spark2.3
- - spark3.0
- - spark3
- - spark3.2
- - spark3.2.0
- - spark3.3
- - mr
- kubernetes
fail-fast: false
- name: -P${{ matrix.profile }}
+ name: ${{ matrix.profile }}
steps:
- - name: Set /etc/hosts mapping
- run: sudo hostname "action-host" | sudo echo "127.0.0.1 action-host" |
sudo tee -a /etc/hosts
- name: Checkout project
uses: actions/checkout@v3
- name: Set up JDK ${{ inputs.java-version }}
@@ -84,14 +74,12 @@ jobs:
mvn-${{ inputs.java-version }}-package-${{ matrix.profile }}-
mvn-${{ inputs.java-version }}-package-
- name: Set up Go ${{ inputs.go-version }}
- if: ${{ matrix.profile == 'kubernetes' }}
+ if: ${{ inputs.go-version != '' }}
uses: actions/setup-go@v3
with:
go-version: ${{ inputs.go-version }}
- cache: true
- cache-dependency-path: deploy/kubernetes/operator/go.sum
- name: Execute `mvn ${{ inputs.maven-args }} -P${{ matrix.profile }}`
- run: mvn -B -fae ${{ inputs.maven-args }} -P${{ matrix.profile }} | tee
/tmp/maven.log
+ run: mvn -B -fae ${{ inputs.maven-args }} -P${{ matrix.profile }}
-DskipUTs -DskipITs | tee /tmp/maven.log
shell: bash
- name: Summary of failures
if: ${{ failure() && inputs.summary != '' }}
diff --git a/.github/workflows/parallel.yml b/.github/workflows/parallel.yml
index 7ae4d48b..67c06293 100644
--- a/.github/workflows/parallel.yml
+++ b/.github/workflows/parallel.yml
@@ -43,10 +43,6 @@ on:
default: 'temurin'
required: false
type: string
- go-version:
- default: '1.17'
- required: false
- type: string
jobs:
maven:
@@ -62,7 +58,6 @@ jobs:
- spark3.2.0
- spark3.3
- mr
- - kubernetes
fail-fast: false
name: -P${{ matrix.profile }}
steps:
@@ -83,13 +78,6 @@ jobs:
restore-keys: |
mvn-${{ inputs.java-version }}-package-${{ matrix.profile }}-
mvn-${{ inputs.java-version }}-package-
- - name: Set up Go ${{ inputs.go-version }}
- if: ${{ matrix.profile == 'kubernetes' }}
- uses: actions/setup-go@v3
- with:
- go-version: ${{ inputs.go-version }}
- cache: true
- cache-dependency-path: deploy/kubernetes/operator/go.sum
- name: Execute `mvn ${{ inputs.maven-args }} -P${{ matrix.profile }}`
run: mvn -B -fae ${{ inputs.maven-args }} -P${{ matrix.profile }} | tee
/tmp/maven.log
shell: bash
diff --git a/deploy/kubernetes/pom.xml b/deploy/kubernetes/pom.xml
index 08ec259c..c45ddfe6 100644
--- a/deploy/kubernetes/pom.xml
+++ b/deploy/kubernetes/pom.xml
@@ -53,6 +53,7 @@
</goals>
<configuration>
<executable>${basedir}/test-operator.sh</executable>
+ <skip>${skipTests}</skip>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index df2153c3..0fb2ebc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,8 @@
<snappy-java.version>1.1.8.4</snappy-java.version>
<test.redirectToFile>true</test.redirectToFile>
<trimStackTrace>false</trimStackTrace>
+ <skipUTs>${skipTests}</skipUTs>
+ <skipITs>${skipTests}</skipITs>
</properties>
<repositories>
@@ -749,6 +751,7 @@
<argLine>${argLine} -ea -Xmx3g</argLine>
<failIfNoTests>false</failIfNoTests>
<trimStackTrace>${trimStackTrace}</trimStackTrace>
+ <skipTests>${skipUTs}</skipTests>
</configuration>
</plugin>
