This is an automated email from the ASF dual-hosted git repository.

rickyma 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 e0a2e3db2 [#1834] improvement(test): Upload failed integration test 
logs of GA (#1835)
e0a2e3db2 is described below

commit e0a2e3db23094452432be45c8331cd1ef948c962
Author: Zhen Wang <643348...@qq.com>
AuthorDate: Thu Jun 27 10:42:08 2024 +0800

    [#1834] improvement(test): Upload failed integration test logs of GA (#1835)
    
    ### What changes were proposed in this pull request?
    
    Upload failed integration test logs of GA.
    
    ### Why are the changes needed?
    
    Convenient troubleshooting of flaky tests.
    
    Fix: #1834.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Existing UTs.
---
 .github/workflows/build.yml                        |  4 +++
 .github/workflows/parallel.yml                     | 11 ++++++++
 .../common/src/test/resources/log4j2.xml           | 33 ++++++++++++++++++++++
 integration-test/mr/src/test/resources/log4j2.xml  | 33 ++++++++++++++++++++++
 .../spark-common/src/test/resources/log4j2.xml     | 33 ++++++++++++++++++++++
 .../spark2/src/test/resources/log4j2.xml           | 33 ++++++++++++++++++++++
 .../spark3/src/test/resources/log4j2.xml           | 33 ++++++++++++++++++++++
 integration-test/tez/src/test/resources/log4j2.xml | 33 ++++++++++++++++++++++
 8 files changed, 213 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b1a2e034..4af4c8393 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,6 +83,8 @@ jobs:
     uses: ./.github/workflows/parallel.yml
     with:
       maven-args: package -Dtest=!org.apache.uniffle.test.**
+      tests-name: 'unit-tests'
+      reports-name: 'unit-reports'
       reports-path: |
         **/target/surefire-reports/*.txt
         **/target/surefire-reports/*.xml
@@ -91,6 +93,8 @@ jobs:
     uses: ./.github/workflows/parallel.yml
     with:
       maven-args: package -Dtest=org.apache.uniffle.test.**
+      tests-name: 'integration-tests'
+      reports-name: 'integration-reports'
       reports-path: |
         **/target/surefire-reports/*.txt
         **/target/surefire-reports/*.xml
diff --git a/.github/workflows/parallel.yml b/.github/workflows/parallel.yml
index 5ea5cd67b..6adf0f095 100644
--- a/.github/workflows/parallel.yml
+++ b/.github/workflows/parallel.yml
@@ -35,6 +35,10 @@ on:
         default: 'test-reports'
         required: false
         type: string
+      tests-name:
+        default: 'unit-tests'
+        required: false
+        type: string
       java-version:
         default: '8'
         required: false
@@ -105,3 +109,10 @@ jobs:
       continue-on-error: true
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3
+    - name: Upload test logs
+      if: failure()
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ inputs.tests-name }}-log-${{ matrix.profile }}
+        path: |
+          **/target/unit-tests.log
diff --git a/integration-test/common/src/test/resources/log4j2.xml 
b/integration-test/common/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..7bf322857
--- /dev/null
+++ b/integration-test/common/src/test/resources/log4j2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<Configuration status="WARN" monitorInterval="30">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </Console>
+    <File name="file" fileName="target/unit-tests.log">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </File>
+  </Appenders>
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="file"/>
+    </Root>
+  </Loggers>
+</Configuration>
diff --git a/integration-test/mr/src/test/resources/log4j2.xml 
b/integration-test/mr/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..7bf322857
--- /dev/null
+++ b/integration-test/mr/src/test/resources/log4j2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<Configuration status="WARN" monitorInterval="30">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </Console>
+    <File name="file" fileName="target/unit-tests.log">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </File>
+  </Appenders>
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="file"/>
+    </Root>
+  </Loggers>
+</Configuration>
diff --git a/integration-test/spark-common/src/test/resources/log4j2.xml 
b/integration-test/spark-common/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..7bf322857
--- /dev/null
+++ b/integration-test/spark-common/src/test/resources/log4j2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<Configuration status="WARN" monitorInterval="30">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </Console>
+    <File name="file" fileName="target/unit-tests.log">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </File>
+  </Appenders>
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="file"/>
+    </Root>
+  </Loggers>
+</Configuration>
diff --git a/integration-test/spark2/src/test/resources/log4j2.xml 
b/integration-test/spark2/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..7bf322857
--- /dev/null
+++ b/integration-test/spark2/src/test/resources/log4j2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<Configuration status="WARN" monitorInterval="30">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </Console>
+    <File name="file" fileName="target/unit-tests.log">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </File>
+  </Appenders>
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="file"/>
+    </Root>
+  </Loggers>
+</Configuration>
diff --git a/integration-test/spark3/src/test/resources/log4j2.xml 
b/integration-test/spark3/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..7bf322857
--- /dev/null
+++ b/integration-test/spark3/src/test/resources/log4j2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<Configuration status="WARN" monitorInterval="30">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </Console>
+    <File name="file" fileName="target/unit-tests.log">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </File>
+  </Appenders>
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="file"/>
+    </Root>
+  </Loggers>
+</Configuration>
diff --git a/integration-test/tez/src/test/resources/log4j2.xml 
b/integration-test/tez/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..7bf322857
--- /dev/null
+++ b/integration-test/tez/src/test/resources/log4j2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<Configuration status="WARN" monitorInterval="30">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </Console>
+    <File name="file" fileName="target/unit-tests.log">
+      <PatternLayout pattern="[%d{yyyy-MM-dd HH:mm:ss.SSS}] [%t] [%p] %c{1}.%M 
- %m%n%ex"/>
+    </File>
+  </Appenders>
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+      <AppenderRef ref="file"/>
+    </Root>
+  </Loggers>
+</Configuration>

Reply via email to