Skip to content

Commit

Permalink
Adding CI matrix for jdk 8, 11 and 14 (#159)
Browse files Browse the repository at this point in the history
* Adding CI matrix for jdk 8, 11 and 14

Signed-off-by: Sagar Upadhyaya <upasagar@amazon.com>

* Removing exclude tools.jar logic

Signed-off-by: Sagar Upadhyaya <upasagar@amazon.com>

* Excluding rolling upgrade test for jdk8

Signed-off-by: Sagar Upadhyaya <upasagar@amazon.com>

Co-authored-by: Sagar Upadhyaya <upasagar@amazon.com>
  • Loading branch information
sgup432 and Sagar Upadhyaya committed Mar 15, 2022
1 parent ca67800 commit 0f55dd5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@ on:

jobs:
build_pa_pkg:
strategy:
matrix:
java:
- 8
- 11
- 14
runs-on: [ubuntu-latest]
name: Building PA package
steps:
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 14
java-version: ${{matrix.java}}
# Performance Analyzer in ./tmp/performance-analyzer
- name: Checkout Performance Analyzer package
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions DEVELOPER_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- [Developer Guide](#developer-guide)
- [Forking and Cloning](#forking-and-cloning)
- [Install Prerequisites](#install-prerequisites)
- [JDK 14](#jdk-14)
- [JDK 11](#jdk-11)
- [Building](#building)
- [Using IntelliJ IDEA](#using-intellij-idea)
- [Submitting Changes](#submitting-changes)
Expand All @@ -16,9 +16,9 @@ Fork this repository on GitHub, and clone locally with `git clone`.

### Install Prerequisites

#### JDK 14
#### JDK 11

OpenSearch components build using Java 14 at a minimum. This means you must have a JDK 14 installed with the environment variable `JAVA_HOME` referencing the path to Java home for your JDK 14 installation, e.g. `JAVA_HOME=/usr/lib/jvm/jdk-14`.
OpenSearch components build using Java 11 at a minimum. This means you must have a JDK 11 installed with the environment variable `JAVA_HOME` referencing the path to Java home for your JDK 11 installation, e.g. `JAVA_HOME=/usr/lib/jvm/jdk-11`.

### Building

Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@ bundlePlugin {
from('build/resources/main/') {
include "plugin-security.policy"
}
exclude('tools.jar')
from("config/opensearch-performance-analyzer") {
into "config"
}
Expand Down Expand Up @@ -644,7 +643,10 @@ task bwcTestSuite(type: StandaloneRestIntegTestTask) {
exclude '**/*Test*'
exclude '**/*IT*'
dependsOn tasks.named("${baseName}#mixedClusterTask")
dependsOn tasks.named("${baseName}#rollingUpgradeClusterTask")
if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
// Only running this for > jdk8 versions as of now.
dependsOn tasks.named("${baseName}#rollingUpgradeClusterTask")
}
dependsOn tasks.named("${baseName}#fullRestartClusterTask")
}

Expand Down

0 comments on commit 0f55dd5

Please sign in to comment.