Skip to content

Commit d902450

Browse files
committed
changing alias_test_oci_profile property to initialize with environment variable to make local developer builds simpler
1 parent 1cb1d0f commit d902450

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

integration-tests/alias-test/Jenkinsfile.generate-child

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ pipeline {
99
environment {
1010
oci_config_file_creds = 'wkt-oci-config-file'
1111
oci_signing_key_creds = 'wkt-oci-signing-key'
12+
oci_profile = 'DEFAULT'
13+
1214
jenkins_user = sh(returnStdout: true, script: "id -nu").trim()
1315
jenkins_uid = sh(returnStdout: true, script: "id -u").trim()
1416
jenkins_group = sh(returnStdout: true, script: "id -ng").trim()
@@ -66,7 +68,7 @@ pipeline {
6668
// -Dwls_java_home will point to JDK7 for early WLS versions where it is required.
6769
// For all newer versions, it points to the JAVA_HOME location so it is a no-op.
6870
//
69-
sh 'pushd integration-tests/alias-test/generate && mvn -B install -Dalias-test-skip-generate=false -Dskip-wdt-install=true -Dwls_java_home=/u01/jdk && popd'
71+
sh 'pushd integration-tests/alias-test/generate && mvn -B install -Dalias-test-skip-generate=false -Dskip-wdt-install=true -Dalias_test_oci_profile=${oci_profile} -Dwls_java_home=/u01/jdk && popd'
7072
}
7173
}
7274
}

integration-tests/alias-test/generate/pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,15 @@
4545
<requireProperty>
4646
<property>alias_test_tenancy</property>
4747
<message>
48-
You must specify the alias_test_tenancy property that determines the
49-
namespaceName used to upload the generated files.
48+
You must specify the alias_test_tenancy property that determines the namespace used to upload the generated files.
49+
</message>
50+
<regex>^[a-zA-Z0-9_]+.*$</regex>
51+
<regexMessage>The alias_test_tenancy must start with an alphanumeric character</regexMessage>
52+
</requireProperty>
53+
<requireProperty>
54+
<property>alias_test_oci_profile</property>
55+
<message>
56+
You must specify the alias_test_oci_profile property that determines the profile in your $HOME/.oci/config file to use to upload the generated files.
5057
</message>
5158
<regex>^[a-zA-Z0-9_]+.*$</regex>
5259
<regexMessage>The alias_test_tenancy must start with an alphanumeric character</regexMessage>

integration-tests/alias-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<properties>
2020
<mw_home>${env.ORACLE_HOME}</mw_home>
2121
<alias_test_tenancy>${env.WKT_TENANCY}</alias_test_tenancy>
22-
<alias_test_oci_profile>DEFAULT</alias_test_oci_profile>
22+
<alias_test_oci_profile>${env.WKT_DEFAULT_OCI_PROFILE}</alias_test_oci_profile>
2323
</properties>
2424

2525
<modules>

integration-tests/alias-test/verify/pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,15 @@
4949
<requireProperty>
5050
<property>alias_test_tenancy</property>
5151
<message>
52-
You must specify the alias_test_tenancy property that determines the
53-
namespaceName used to download the generated files.
52+
You must specify the alias_test_tenancy property that determines the namespace used to download the generated files.
53+
</message>
54+
<regex>^[a-zA-Z0-9_]+.*$</regex>
55+
<regexMessage>The alias_test_tenancy must start with an alphanumeric character</regexMessage>
56+
</requireProperty>
57+
<requireProperty>
58+
<property>alias_test_oci_profile</property>
59+
<message>
60+
You must specify the alias_test_oci_profile property that determines the profile in your $HOME/.oci/config file to use to download the generated files.
5461
</message>
5562
<regex>^[a-zA-Z0-9_]+.*$</regex>
5663
<regexMessage>The alias_test_tenancy must start with an alphanumeric character</regexMessage>

0 commit comments

Comments
 (0)