Commit d902450

committed

changing alias_test_oci_profile property to initialize with environment variable to make local developer builds simpler

1 parent 1cb1d0f commit d902450Copy full SHA for d902450

File tree

+22

-6

lines changed

+22

-6

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ pipeline {`
`9`	`9`	`environment {`
`10`	`10`	`oci_config_file_creds = 'wkt-oci-config-file'`
`11`	`11`	`oci_signing_key_creds = 'wkt-oci-signing-key'`
	`12`	`+ oci_profile = 'DEFAULT'`
	`13`	`+`
`12`	`14`	`jenkins_user = sh(returnStdout: true, script: "id -nu").trim()`
`13`	`15`	`jenkins_uid = sh(returnStdout: true, script: "id -u").trim()`
`14`	`16`	`jenkins_group = sh(returnStdout: true, script: "id -ng").trim()`
`@@ -66,7 +68,7 @@ pipeline {`
`66`	`68`	`// -Dwls_java_home will point to JDK7 for early WLS versions where it is required.`
`67`	`69`	`// For all newer versions, it points to the JAVA_HOME location so it is a no-op.`
`68`	`70`	`//`
`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'`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`	`}`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,15 @@`
`45`	`45`	`<requireProperty>`
`46`	`46`	`<property>alias_test_tenancy</property>`
`47`	`47`	`<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.`
`50`	`57`	`</message>`
`51`	`58`	`<regex>^[a-zA-Z0-9_]+.*$</regex>`
`52`	`59`	`<regexMessage>The alias_test_tenancy must start with an alphanumeric character</regexMessage>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`<properties>`
`20`	`20`	`<mw_home>${env.ORACLE_HOME}</mw_home>`
`21`	`21`	`<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>`
`23`	`23`	`</properties>`
`24`	`24`
`25`	`25`	`<modules>`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,15 @@`
`49`	`49`	`<requireProperty>`
`50`	`50`	`<property>alias_test_tenancy</property>`
`51`	`51`	`<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.`
`54`	`61`	`</message>`
`55`	`62`	`<regex>^[a-zA-Z0-9_]+.*$</regex>`
`56`	`63`	`<regexMessage>The alias_test_tenancy must start with an alphanumeric character</regexMessage>`

Comments

(0)