hadoop-ozone-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [hadoop-ozone] 01/01: Integration test separation and experimetal builds
Date Fri, 29 Nov 2019 08:58:10 GMT
This is an automated email from the ASF dual-hosted git repository.

elek pushed a commit to branch integration-test-cleanup
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git

commit 34c647b2dace24987b93cb5782b666afbe6e1378
Author: Márton Elek <elek@apache.org>
AuthorDate: Fri Nov 29 09:57:57 2019 +0100

    Integration test separation and experimetal builds
---
 .github/workflows/post-commit.yml                  | 120 +++++----------------
 .github/workflows/pr.yml                           | 114 --------------------
 hadoop-ozone/dev-support/checks/integration.sh     |   8 +-
 .../checks/{integration.sh => ozonefs.sh}          |   4 +-
 .../checks/{integration.sh => tools.sh}            |  10 +-
 5 files changed, 39 insertions(+), 217 deletions(-)

diff --git a/.github/workflows/post-commit.yml b/.github/workflows/post-commit.yml
index 5097be4..e23b909 100644
--- a/.github/workflows/post-commit.yml
+++ b/.github/workflows/post-commit.yml
@@ -12,110 +12,46 @@
 # 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.
-name: build-branch
+name: integration-pilot
 on:
   - push
 jobs:
-  build:
-    name: compile
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@master
-      - uses: ./.github/buildenv
-        with:
-          args: ./hadoop-ozone/dev-support/checks/build.sh
-  rat:
-    name: rat
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/rat.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: rat
-            path: target/rat
-  author:
-    name: author
+  integration:
+    name: integration
     runs-on: ubuntu-18.04
     steps:
         - uses: actions/checkout@master
         - uses: ./.github/buildenv
           with:
-             args: ./hadoop-ozone/dev-support/checks/author.sh
+             args: ./hadoop-ozone/dev-support/checks/integration.sh
         - uses: actions/upload-artifact@master
           if: always()
           with:
-            name: author
-            path: target/author
-  unit:
-    name: unit
+            name: integration
+            path: target/integration
+  ozonefs:
+    name: ozonefs
     runs-on: ubuntu-18.04
     steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/unit.sh
-        - uses: ./.github/buildenv
-          if: github.repository == 'apache/hadoop-ozone'
-          with:
-            args: ./hadoop-ozone/dev-support/checks/sonar.sh
-          env:
-            SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: unit
-            path: target/unit
-  checkstyle:
-    name: checkstyle
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/checkstyle.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: checkstyle
-            path: target/checkstyle
-  findbugs:
-    name: findbugs
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/findbugs.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: findbugs
-            path: target/findbugs
-  acceptance:
-    name: acceptance
+      - uses: actions/checkout@master
+      - uses: ./.github/buildenv
+        with:
+          args: ./hadoop-ozone/dev-support/checks/ozonefs.sh
+      - uses: actions/upload-artifact@master
+        if: always()
+        with:
+          name: ozonefs
+          path: target/ozonefs
+  tools:
+    name: tools
     runs-on: ubuntu-18.04
-    needs:
-       - build
-       - rat
-       - checkstyle
-       - unit
-       - findbugs
     steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-            args: ./hadoop-ozone/dev-support/checks/build.sh
-        - run: sudo pip install robotframework
-        - run: sudo chown runner -R .
-        - run: cd ./hadoop-ozone/dist/target/ozone-*-SNAPSHOT/ && mkdir .aws &&
sudo chown 1000 .aws 
-        - run: ./hadoop-ozone/dev-support/checks/acceptance.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: acceptance
-            path: target/acceptance
+      - uses: actions/checkout@master
+      - uses: ./.github/buildenv
+        with:
+          args: ./hadoop-ozone/dev-support/checks/tools.sh
+      - uses: actions/upload-artifact@master
+        if: always()
+        with:
+          name: tools
+          path: target/tools
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
deleted file mode 100644
index eb39fad..0000000
--- a/.github/workflows/pr.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.
-name: pr-check
-on:
-  - pull_request
-jobs:
-  build:
-    name: compile
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@master
-      - uses: ./.github/buildenv
-        with:
-          args: ./hadoop-ozone/dev-support/checks/build.sh
-  rat:
-    name: rat
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/rat.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: rat
-            path: target/rat
-  author:
-    name: author
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/author.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: author
-            path: target/author
-  unit:
-    name: unit
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/unit.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: unit
-            path: target/unit
-  checkstyle:
-    name: checkstyle
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/checkstyle.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: checkstyle
-            path: target/checkstyle
-  findbugs:
-    name: findbugs
-    runs-on: ubuntu-18.04
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-             args: ./hadoop-ozone/dev-support/checks/findbugs.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: findbugs
-            path: target/findbugs
-  acceptance:
-    name: acceptance
-    runs-on: ubuntu-18.04
-    needs:
-       - build
-       - rat
-       - checkstyle
-       - unit
-       - findbugs
-    steps:
-        - uses: actions/checkout@master
-        - uses: ./.github/buildenv
-          with:
-            args: ./hadoop-ozone/dev-support/checks/build.sh
-        - run: sudo pip install robotframework
-        - run: sudo chown runner -R .
-        - run: cd ./hadoop-ozone/dist/target/ozone-*-SNAPSHOT/ && mkdir .aws &&
sudo chown 1000 .aws 
-        - run: ./hadoop-ozone/dev-support/checks/acceptance.sh
-        - uses: actions/upload-artifact@master
-          if: always()
-          with:
-            name: acceptance
-            path: target/acceptance
diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/integration.sh
index d7883de..6437a58 100755
--- a/hadoop-ozone/dev-support/checks/integration.sh
+++ b/hadoop-ozone/dev-support/checks/integration.sh
@@ -16,13 +16,13 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd "$DIR/../../.." || exit 1
 
-export MAVEN_OPTS="-Xmx4096m"
-mvn -B install -DskipTests
-mvn -B -fn test -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem,:hadoop-ozone-tools
"$@"
-
 REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/integration"}
 mkdir -p "$REPORT_DIR"
 
+export MAVEN_OPTS="-Xmx4096m"
+mvn -B install -DskipTests
+mvn -B -fn test -pl :hadoop-ozone-integration-test "$@" | tee $REPORT_DIR/output.log
+
 # shellcheck source=hadoop-ozone/dev-support/checks/_mvn_unit_report.sh
 source "$DIR/_mvn_unit_report.sh"
 
diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/ozonefs.sh
similarity index 87%
copy from hadoop-ozone/dev-support/checks/integration.sh
copy to hadoop-ozone/dev-support/checks/ozonefs.sh
index d7883de..3caccbb 100755
--- a/hadoop-ozone/dev-support/checks/integration.sh
+++ b/hadoop-ozone/dev-support/checks/ozonefs.sh
@@ -18,9 +18,9 @@ cd "$DIR/../../.." || exit 1
 
 export MAVEN_OPTS="-Xmx4096m"
 mvn -B install -DskipTests
-mvn -B -fn test -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem,:hadoop-ozone-tools
"$@"
+mvn -B -fn test -pl :hadoop-ozone-filesystem "$@"
 
-REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/integration"}
+REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/ozonefs"}
 mkdir -p "$REPORT_DIR"
 
 # shellcheck source=hadoop-ozone/dev-support/checks/_mvn_unit_report.sh
diff --git a/hadoop-ozone/dev-support/checks/integration.sh b/hadoop-ozone/dev-support/checks/tools.sh
similarity index 78%
copy from hadoop-ozone/dev-support/checks/integration.sh
copy to hadoop-ozone/dev-support/checks/tools.sh
index d7883de..23c453f 100755
--- a/hadoop-ozone/dev-support/checks/integration.sh
+++ b/hadoop-ozone/dev-support/checks/tools.sh
@@ -13,20 +13,20 @@
 # 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.
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 cd "$DIR/../../.." || exit 1
 
 export MAVEN_OPTS="-Xmx4096m"
 mvn -B install -DskipTests
-mvn -B -fn test -pl :hadoop-ozone-integration-test,:hadoop-ozone-filesystem,:hadoop-ozone-tools
"$@"
+mvn -B -fn test -pl :hadoop-ozone-tools "$@"
 
-REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/integration"}
+REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/tools"}
 mkdir -p "$REPORT_DIR"
 
 # shellcheck source=hadoop-ozone/dev-support/checks/_mvn_unit_report.sh
 source "$DIR/_mvn_unit_report.sh"
 
-if [[ -s "$REPORT_DIR/summary.txt" ]] ; then
-    exit 1
+if [[ -s "$REPORT_DIR/summary.txt" ]]; then
+  exit 1
 fi
 exit 0


---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org


Mime
View raw message