Skip to content

Commit b838ae9

Browse files
jerboaajerboaa
authored
Add semeru open modules (#236)
Use them for OpenJ9 builds
1 parent 6e4f542 commit b838ae9

File tree

10 files changed

+149
-20
lines changed

10 files changed

+149
-20
lines changed

‎modules/jdk/semeru-11-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
#!/bin/sh
3+
# ==============================================================================
4+
# JDK specific customizations
5+
#
6+
# ==============================================================================
7+
8+
function jvm_specific_diagnostics() {
9+
echo ""
10+
}

‎modules/jdk/semeru-11-open/configure.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/sh
2+
# Configure module
3+
set -e
4+
5+
SCRIPT_DIR=$(dirname $0)
6+
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7+
8+
chown -R jboss:root $SCRIPT_DIR
9+
chmod -R ug+rwX $SCRIPT_DIR
10+
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
11+
12+
pushd ${ARTIFACTS_DIR}
13+
cp -pr * /
14+
popd
15+
16+
alternatives --set java /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/java
17+
alternatives --set javac /usr/lib/jvm/ibm-semeru-open-11-jdk/bin/javac
18+
19+
# Update securerandom.source for quicker starts
20+
JAVA_SECURITY_FILE=/usr/lib/jvm/ibm-semeru-open-11-jdk/conf/security/java.security
21+
SECURERANDOM=securerandom.source
22+
if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then
23+
sed -i "s|^$SECURERANDOM=.*|$SECURERANDOM=file:/dev/urandom|" $JAVA_SECURITY_FILE
24+
else
25+
echo $SECURERANDOM=file:/dev/urandom >> $JAVA_SECURITY_FILE
26+
fi

‎modules/jdk/semeru-11-open/module.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
schema_version: 1
2+
3+
name: "jboss.container.openjdk.jdk"
4+
description: "Installs the JDK for OpenJ9 11."
5+
version: "semeru-11-open"
6+
7+
labels:
8+
- name: "org.jboss.product"
9+
value: "openjdk"
10+
- name: "org.jboss.product.version"
11+
value: "11"
12+
- name: "org.jboss.product.openjdk.version"
13+
value: "11"
14+
15+
envs:
16+
- name: "JAVA_HOME"
17+
value: "/usr/lib/jvm/ibm-semeru-open-11-jdk"
18+
- name: "JAVA_VENDOR"
19+
value: "IBM"
20+
- name: "JAVA_VERSION"
21+
value: "11"
22+
23+
packages:
24+
install:
25+
- ibm-semeru-open-11-jdk
26+
27+
modules:
28+
install:
29+
- name: jboss.container.user
30+
31+
execute:
32+
- script: configure.sh

‎modules/jdk/semeru-8-open/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
#!/bin/sh
3+
# ==============================================================================
4+
# JDK specific customizations
5+
#
6+
# ==============================================================================
7+
8+
function jvm_specific_diagnostics() {
9+
echo ""
10+
}

‎modules/jdk/semeru-8-open/configure.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/sh
2+
# Configure module
3+
set -e
4+
5+
SCRIPT_DIR=$(dirname $0)
6+
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7+
8+
chown -R jboss:root $SCRIPT_DIR
9+
chmod -R ug+rwX $SCRIPT_DIR
10+
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
11+
12+
pushd ${ARTIFACTS_DIR}
13+
cp -pr * /
14+
popd
15+
16+
# Set this JDK as the alternative in use
17+
alternatives --set java /usr/lib/jvm/ibm-semeru-open-8-jdk/bin/java
18+
alternatives --set javac /usr/lib/jvm/ibm-semeru-open-8-jdk/bin/javac
19+
20+
# Update securerandom.source for quicker starts
21+
JAVA_SECURITY_FILE=/usr/lib/jvm/ibm-semeru-open-8-jdk/jre/lib/security/java.security
22+
SECURERANDOM=securerandom.source
23+
if grep -q "^$SECURERANDOM=.*" $JAVA_SECURITY_FILE; then
24+
sed -i "s|^$SECURERANDOM=.*|$SECURERANDOM=file:/dev/urandom|" $JAVA_SECURITY_FILE
25+
else
26+
echo $SECURERANDOM=file:/dev/urandom >> $JAVA_SECURITY_FILE
27+
fi

‎modules/jdk/semeru-8-open/module.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
schema_version: 1
2+
3+
name: "jboss.container.openjdk.jdk"
4+
description: "Installs the JDK for OpenJ9 8."
5+
version: "semeru-8-open"
6+
7+
labels:
8+
- name: "org.jboss.product"
9+
value: "openjdk"
10+
- name: "org.jboss.product.version"
11+
value: "1.8.0"
12+
- name: "org.jboss.product.openjdk.version"
13+
value: "1.8.0"
14+
15+
envs:
16+
- name: "JAVA_HOME"
17+
value: "/usr/lib/jvm/ibm-semeru-open-8-jdk"
18+
- name: "JAVA_VENDOR"
19+
value: "IBM"
20+
- name: "JAVA_VERSION"
21+
value: "1.8.0"
22+
23+
packages:
24+
install:
25+
- ibm-semeru-open-8-jdk
26+
27+
modules:
28+
install:
29+
- name: jboss.container.user
30+
31+
execute:
32+
- script: configure.sh

‎openj9-11-rhel7.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is an Image descriptor for Cekit
22
# use the following extra override to build:
3-
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'pulp_repos': true, 'signing_intent': 'release', 'packages': [ 'java-11-openj9', 'java-11-openj9-devel', 'java-11-openj9-headless' ], 'inherit': true } } } } }"
3+
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'pulp_repos': true, 'signing_intent': 'release', 'packages': [ 'ibm-semeru-open-11-jdk' ], 'inherit': true } } } } }"
44

55
schema_version: 1
66

@@ -54,7 +54,7 @@ modules:
5454
install:
5555
- name: jboss.container.util.pkg-update
5656
- name: jboss.container.openjdk.jdk
57-
version: "openj9-11"
57+
version: "semeru-11-open"
5858
- name: jboss.container.prometheus
5959
version: "7"
6060
- name: jboss.container.jolokia
@@ -77,9 +77,7 @@ osbs:
7777
compose:
7878
# used for requesting ODCS compose of type "tag"
7979
packages:
80-
- java-11-openj9
81-
- java-11-openj9-headless
82-
- java-11-openj9-devel
80+
- ibm-semeru-open-11-jdk
8381
signing_intent: release
8482
# used for inheritance of yum repos and ODCS composes from baseimage build
8583
inherit: true

‎openj9-11-rhel8.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is an Image descriptor for Cekit
22
# use the following extra override to build:
3-
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'signing_intent': 'release', 'packages': [ 'java-11-openj9', 'java-11-openj9-devel', 'java-11-openj9-headless' ], 'inherit': true } } } } }"
3+
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'signing_intent': 'release', 'packages': [ 'ibm-semeru-open-11-jdk' ], 'inherit': true } } } } }"
44

55
schema_version: 1
66

@@ -59,7 +59,7 @@ modules:
5959
install:
6060
- name: jboss.container.util.pkg-update
6161
- name: jboss.container.openjdk.jdk
62-
version: "openj9-11"
62+
version: "semeru-11-open"
6363
- name: jboss.container.prometheus
6464
version: "7"
6565
- name: jboss.container.jolokia
@@ -82,9 +82,7 @@ osbs:
8282
compose:
8383
# used for requesting ODCS compose of type "tag"
8484
packages:
85-
- java-11-openj9
86-
- java-11-openj9-headless
87-
- java-11-openj9-devel
85+
- ibm-semeru-open-11-jdk
8886
signing_intent: release
8987
pulp_repos: true
9088
repository:

‎openj9-8-rhel7.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is an Image descriptor for Cekit
22
# use the following extra override to build:
3-
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'pulp_repos': true, 'signing_intent': 'release', 'packages': [ 'java-1.8.0-openj9', 'java-1.8.0-openj9-devel', 'java-1.8.0-openj9-headless' ], 'inherit': true } } } } }"
3+
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'pulp_repos': true, 'signing_intent': 'release', 'packages': [ 'ibm-semeru-open-8-jdk' ], 'inherit': true } } } } }"
44

55
schema_version: 1
66

@@ -54,7 +54,7 @@ modules:
5454
install:
5555
- name: jboss.container.util.pkg-update
5656
- name: jboss.container.openjdk.jdk
57-
version: "openj9-8"
57+
version: "semeru-8-open"
5858
- name: jboss.container.prometheus
5959
version: "7"
6060
- name: jboss.container.jolokia
@@ -77,9 +77,7 @@ osbs:
7777
compose:
7878
# used for requesting ODCS compose of type "tag"
7979
packages:
80-
- java-1.8.0-openj9
81-
- java-1.8.0-openj9-headless
82-
- java-1.8.0-openj9-devel
80+
- ibm-semeru-open-8-jdk
8381
signing_intent: release
8482
# used for inheritance of yum repos and ODCS composes from baseimage build
8583
inherit: true

‎openj9-8-rhel8.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is an Image descriptor for Cekit
22
# use the following extra override to build:
3-
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'signing_intent': 'release', 'packages': [ 'java-1.8.0-openj9', 'java-1.8.0-openj9-devel', 'java-1.8.0-openj9-headless' ], 'inherit': true } } } } }"
3+
# --overrides "{ 'osbs': { 'configuration': { 'container': { 'platforms': { 'only': [ 's390x' ] }, 'compose': { 'signing_intent': 'release', 'packages': [ 'ibm-semeru-open-8-jdk' ], 'inherit': true } } } } }"
44

55
schema_version: 1
66

@@ -59,7 +59,7 @@ modules:
5959
install:
6060
- name: jboss.container.util.pkg-update
6161
- name: jboss.container.openjdk.jdk
62-
version: "openj9-8"
62+
version: "semeru-8-open"
6363
- name: jboss.container.prometheus
6464
version: "7"
6565
- name: jboss.container.jolokia
@@ -82,9 +82,7 @@ osbs:
8282
compose:
8383
# used for requesting ODCS compose of type "tag"
8484
packages:
85-
- java-1.8.0-openj9
86-
- java-1.8.0-openj9-headless
87-
- java-1.8.0-openj9-devel
85+
- ibm-semeru-open-8-jdk
8886
signing_intent: release
8987
pulp_repos: true
9088
repository:

0 commit comments

Comments
 (0)