Skip to content

Commit f127de2

Browse files
authored
Merge pull request #559 from jmtd/ubi10-test-artifacts
[OPENJDK-3676] convert installing some things over to artifacts:
2 parents df45466 + b999d5b commit f127de2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+44
-144
lines changed

modules/jdk/21/configure.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@
22
# Configure module
33
set -e
44

5-
SCRIPT_DIR=$(dirname $0)
6-
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7-
8-
chown -R $USER: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-
165
# Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files)
176
JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security
187
SECURERANDOM=securerandom.source

modules/jdk/21/module.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ modules:
3333

3434
execute:
3535
- script: configure.sh
36+
37+
artifacts:
38+
- path: artifacts/jvm-options
39+
dest: /opt/jboss/container/openjdk/jdk

modules/jre/21/configure.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

modules/jre/21/module.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ modules:
3333

3434
execute:
3535
- script: configure.sh
36+
37+
artifacts:
38+
- path: artifacts/jvm-options
39+
dest: /opt/jboss/container/openjdk/jre

modules/jvm/configure.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

modules/jvm/module.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ description: ^
55
Provides support for configuring Java JVM, e.g. GC settings, etc. Basic usage
66
is opts=$($JBOSS_CONTAINER_JAVA_JVM_MODULE/java-default-options)
77

8-
execute:
9-
- script: configure.sh
8+
artifacts:
9+
- path: artifacts/jvm
10+
dest: /opt/jboss/container/java/jvm
1011

1112
modules:
1213
install:

0 commit comments

Comments
 (0)