Skip to content

Commit

Permalink
Add jdk 14 build pipeline (#1485)
Browse files Browse the repository at this point in the history
HotSpot only for now
  • Loading branch information
jerboaa authored and gdams committed Jan 22, 2020
1 parent 4b42c90 commit 808b08f
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -11,7 +11,7 @@ https://www.adoptopenjdk.net and https://api.adoptopenjdk.net.
##### Build jdk natively on your system

```
./makejdk-any-platform.sh <jdk8u|jdk9u|jdk10u|jdk11u|jdk12u|jdk13u|jdk>
./makejdk-any-platform.sh <jdk8u|jdk9u|jdk10u|jdk11u|jdk12u|jdk13u|jdk14|jdk>
i.e:
./makejdk-any-platform.sh jdk8u
```
Expand Down Expand Up @@ -45,7 +45,7 @@ personally or at build farm scale.
build jobs used for building Adopt OpenJDK binaries.
2. The `docker` folder contains DockerFiles which can be used as part of building
OpenJDK inside a Docker container.
3. The `docs` folder contains images and utilit scripts to produce up to date
3. The `docs` folder contains images and utility scripts to produce up to date
documentation.
4. The `git-hg` folder contains scripts to clone an OpenJDK mercurial forest into
a GitHub repo ()and regularly update it).
Expand Down
3 changes: 2 additions & 1 deletion build-farm/make-adopt-build-farm.sh
Expand Up @@ -63,7 +63,8 @@ case "${JDK_BOOT_VERSION}" in
"11") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK11_BOOT_DIR}";;
"12") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK12_BOOT_DIR}";;
"13") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK13_BOOT_DIR}";;
*) export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK14_BOOT_DIR}";;
"14") export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK14_BOOT_DIR}";;
*) export JDK_BOOT_DIR="${JDK_BOOT_DIR:-$JDK15_BOOT_DIR}";;
esac

if [ ! -d "${JDK_BOOT_DIR}" ]
Expand Down
112 changes: 112 additions & 0 deletions pipelines/build/openjdk14_pipeline.groovy
@@ -0,0 +1,112 @@
/*
Licensed 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
https://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.
*/

def buildConfigurations = [
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'macos10.12',
test : [
nightly: false,
release: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
]
],

x64Linux : [
os : 'linux',
arch : 'x64',
additionalNodeLabels: 'centos6',
test : [
nightly: false,
release: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.external', 'special.functional']
],
configureArgs : '--disable-ccache'
],

// Currently we have to be quite specific about which windows to use as not all of them have freetype installed
x64Windows: [
os : 'windows',
arch : 'x64',
additionalNodeLabels: [
hotspot: 'win2012&&vs2017'
],
buildArgs : [
hotspot : '--jvm-variant client,server'
],
test : [
nightly: false,
release: ['sanity.openjdk', 'sanity.perf', 'sanity.system', 'extended.system']
]
],

s390xLinux : [
os : 'linux',
arch : 's390x',
test : [
nightly: false,
release: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
],
configureArgs : '--disable-ccache'
],

ppc64leLinux : [
os : 'linux',
arch : 'ppc64le',
test : [
nightly: false,
release: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
],
configureArgs : '--disable-ccache'

],

aarch64Linux : [
os : 'linux',
arch : 'aarch64',
additionalNodeLabels: 'centos7',
test : [
nightly: false,
release: ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
]
],

]

def javaToBuild = "jdk14"

node ("master") {
def scmVars = checkout scm
load "${WORKSPACE}/pipelines/build/common/import_lib.groovy"
Closure configureBuild = load "${WORKSPACE}/pipelines/build/common/build_base_file.groovy"

configureBuild(
javaToBuild,
buildConfigurations,
targetConfigurations,
enableTests,
releaseType,
scmReference,
overridePublishName,
additionalConfigureArgs,
scmVars,
additionalBuildArgs,
overrideFileNameVersion,
cleanWorkspaceBeforeBuild,
adoptBuildNumber,
propagateFailures,
currentBuild,
this,
env
).doBuild()
}
22 changes: 22 additions & 0 deletions pipelines/jobs/configurations/jdk14.groovy
@@ -0,0 +1,22 @@
targetConfigurations = [
"x64Mac" : [
"hotspot"
],
"x64Linux" : [
"hotspot"
],
"x64Windows" : [
"hotspot"
],
"ppc64leLinux": [
"hotspot"
],
"s390xLinux" : [
"hotspot"
],
"aarch64Linux": [
"hotspot"
]
]

return this
2 changes: 2 additions & 0 deletions sbin/common/constants.sh
Expand Up @@ -20,6 +20,7 @@ export JDK10_VERSION="jdk10u";
export JDK11_VERSION="jdk11u";
export JDK12_VERSION="jdk12u";
export JDK13_VERSION="jdk13u";
export JDK14_VERSION="jdk14";
export JDKHEAD_VERSION="jdk";

export JDK8_CORE_VERSION="jdk8";
Expand All @@ -28,6 +29,7 @@ export JDK10_CORE_VERSION="jdk10";
export JDK11_CORE_VERSION="jdk11";
export JDK12_CORE_VERSION="jdk12";
export JDK13_CORE_VERSION="jdk13";
export JDK14_CORE_VERSION="${JDK14_VERSION}";
export JDKHEAD_CORE_VERSION="${JDKHEAD_VERSION}";
export AMBER_CORE_VERSION="amber";

Expand Down

0 comments on commit 808b08f

Please sign in to comment.