You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2020/08/11 13:28:05 UTC
[accumulo-testing] branch main updated: Update for main branch and
GitHub Actions CI
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git
The following commit(s) were added to refs/heads/main by this push:
new d4a99a3 Update for main branch and GitHub Actions CI
d4a99a3 is described below
commit d4a99a3ccc6be7c867a446594d7305ef6dba3dd0
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Aug 11 09:27:41 2020 -0400
Update for main branch and GitHub Actions CI
---
.github/workflows/maven.yaml | 76 +++++++++++++++++++++++++++++++++++
.travis.yml | 30 --------------
README.md | 4 +-
pom.xml | 2 +-
test/automation/README.md | 2 +-
test/automation/cluster_props.sh | 6 +--
test/compat/japi-compliance/README.md | 2 +-
test/upgrade/upgrade_test.sh | 2 +-
8 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
new file mode 100644
index 0000000..91530bf
--- /dev/null
+++ b/.github/workflows/maven.yaml
@@ -0,0 +1,76 @@
+#
+# 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.
+#
+
+# 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: QA
+
+on:
+ push:
+ branches: [ '*' ]
+ pull_request:
+ branches: [ '*' ]
+
+jobs:
+ mvn:
+ strategy:
+ matrix:
+ profile:
+ - {name: 'verify', args: 'verify'}
+ fail-fast: false
+ timeout-minutes: 60
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK 11
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - name: Cache local maven repository
+ uses: actions/cache@v2
+ with:
+ path: |
+ ~/.m2/repository/
+ !~/.m2/repository/org/apache/accumulo
+ key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-m2
+ - name: Build with Maven (${{ matrix.profile.name }})
+ run: mvn -B -V -e -ntp "-Dstyle.color=always" ${{ matrix.profile.args }}
+ env:
+ MAVEN_OPTS: -Djansi.force=true
+ - name: Upload unit test results
+ uses: actions/upload-artifact@v2
+ with:
+ name: surefire-reports-${{ matrix.profile.name }}
+ path: ./**/target/surefire-reports/
+ if-no-files-found: ignore
+ - name: Upload integration test results
+ uses: actions/upload-artifact@v2
+ with:
+ name: failsafe-reports-${{ matrix.profile.name }}
+ path: ./**/target/failsafe-reports/
+ if-no-files-found: ignore
+ - name: Upload mini test logs
+ uses: actions/upload-artifact@v2
+ with:
+ name: mini-tests-logs-${{ matrix.profile.name }}
+ path: ./**/target/**/mini-tests/**/logs/
+ if-no-files-found: ignore
+
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d344cd4..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,30 +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.
-
-language: java
-# speed up builds; don't use cache with default install step
-cache:
- directories:
- - $HOME/.m2
-install: echo NOOP Skipping pre-fetch of Maven dependencies
-jdk:
- - openjdk11
-before_script:
- - unset _JAVA_OPTIONS
-env:
- - BUILD_CMD="mvn -U clean verify"
-# suppress download logs which cause travis to exceed the 4MB build log output limit
-script:
- - $BUILD_CMD -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
diff --git a/README.md b/README.md
index 30bc1a8..150d1cb 100644
--- a/README.md
+++ b/README.md
@@ -252,5 +252,5 @@ See the [readme.md](/test/automation/README.md).
[modules]: core/src/main/resources/randomwalk/modules
[image]: core/src/main/resources/randomwalk/modules/Image.xml
[Docker Swarm]: https://docs.docker.com/engine/swarm/swarm-tutorial/
-[ti]: https://travis-ci.org/apache/accumulo-testing.svg?branch=master
-[tl]: https://travis-ci.org/apache/accumulo-testing
+[ti]: https://github.com/apache/accumulo-testing/workflows/QA/badge.svg
+[tl]: https://github.com/apache/accumulo-testing/actions
diff --git a/pom.xml b/pom.xml
index c94d8c2..48261a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
diff --git a/test/automation/README.md b/test/automation/README.md
index 06a74ea..39ee098 100644
--- a/test/automation/README.md
+++ b/test/automation/README.md
@@ -2,7 +2,7 @@
Testing a snapshot version of Accumulo on a cluster using this respository requires many repetive steps. Luckily, there is script that automates this using [Muchos]. This script is found in [test/automation/automateEC2.sh](automateEC2.sh).
-Before running the script, edit [cluster_props.sh](cluster_props.sh). All repositories are set to the master branch of the corresponding Apache project by default. You can change these values to your specific forks and branches as desired.
+Before running the script, edit [cluster_props.sh](cluster_props.sh). All repositories are set to the main branch of the corresponding Apache project by default. You can change these values to your specific forks and branches as desired.
A path to `muchos.props` is required in order to run the script. You can find the required configurations and an example of `muchos.props` [in the official Fluo-Muchos readme][Muchos].
diff --git a/test/automation/cluster_props.sh b/test/automation/cluster_props.sh
index 1466f15..06b8737 100644
--- a/test/automation/cluster_props.sh
+++ b/test/automation/cluster_props.sh
@@ -16,13 +16,13 @@
# limitations under the License.
export ACCUMULO_REPO=https://github.com/apache/accumulo.git
-export ACCUMULO_BRANCH=master
+export ACCUMULO_BRANCH=main
export ACCUMULO_TESTING_REPO=https://github.com/apache/accumulo-testing.git
-export ACCUMULO_TESTING_BRANCH=master
+export ACCUMULO_TESTING_BRANCH=main
export FLUO_MUCHOS_REPO=https://github.com/apache/fluo-muchos
-export FLUO_MUCHOS_BRANCH=master
+export FLUO_MUCHOS_BRANCH=main
export MUCHOS_PROPS=${MUCHOS_PROPS:-/path/to/muchos/props}
diff --git a/test/compat/japi-compliance/README.md b/test/compat/japi-compliance/README.md
index a68ed52..79f5f3a 100644
--- a/test/compat/japi-compliance/README.md
+++ b/test/compat/japi-compliance/README.md
@@ -13,7 +13,7 @@ Optionally, you can use the --skip-classes argument with the provided exclude_cl
org.apache.accumulo.core.data that aren't in the public API.
This directory should have a library configuration file for each release on supported lines as well as an in-progress
-for whatever version is currently the master branch. The examples below all make use of version-specific library definitions.
+for whatever version is currently the main branch. The examples below all make use of version-specific library definitions.
When looking at a patch release, you should verify that changes introduced are forwards and backwards compatible, per
semver.
diff --git a/test/upgrade/upgrade_test.sh b/test/upgrade/upgrade_test.sh
index 2ab466c..e7c36af 100755
--- a/test/upgrade/upgrade_test.sh
+++ b/test/upgrade/upgrade_test.sh
@@ -78,7 +78,7 @@ else
fi
cd $ACCUMULO_DIR
-git checkout master
+git checkout main
git clean -xfd
cd $UNO_DIR
./bin/uno fetch accumulo