From d434f957913681928275dfef492525826d68dfa8 Mon Sep 17 00:00:00 2001 From: Osni Oliveira Date: Thu, 24 Aug 2017 16:25:04 -0300 Subject: [PATCH] [CLOUD-1867] update datavirt-app-config secret to use new src location Change existing test to rely on new default value for APP_DATADIR (== data) Add new test for custom APP_DATADIR Signed-off-by: Osni Oliveira --- os-eap-s2i/added/s2i/assemble | 3 ++ tests/features/datavirt/datavirt_s2i.feature | 48 ++++++++++++++++++-- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/os-eap-s2i/added/s2i/assemble b/os-eap-s2i/added/s2i/assemble index 5dd45799..be5a370b 100755 --- a/os-eap-s2i/added/s2i/assemble +++ b/os-eap-s2i/added/s2i/assemble @@ -16,6 +16,9 @@ DEPLOY_DIR=$JBOSS_HOME/standalone/deployments # JBoss AS data dir. Can be overridden. DATA_DIR=${DATA_DIR:-$JBOSS_HOME/standalone/data} +# App data dir. Can be overridden. +APP_DATADIR=${APP_DATADIR:-data} + # the subdirectory within LOCAL_SOURCE_DIR from where we should copy build # artifacts (*.war, *.jar) ARTIFACT_DIR=${ARTIFACT_DIR:-target} diff --git a/tests/features/datavirt/datavirt_s2i.feature b/tests/features/datavirt/datavirt_s2i.feature index 4807ad67..4df14971 100644 --- a/tests/features/datavirt/datavirt_s2i.feature +++ b/tests/features/datavirt/datavirt_s2i.feature @@ -1,6 +1,6 @@ @jboss-datavirt-6/datavirt63-openshift Feature: Openshift JDV s2i tests - Scenario: Test if VDBs,RAs, and datasources are deployed + Scenario: Test if VDBs, RAs, and datasources are deployed Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from datavirt/dynamicvdb-datafederation/app with env | variable | value | | EAP_SECDOMAIN_NAME | eap-secdomain-name | @@ -21,16 +21,56 @@ Feature: Openshift JDV s2i tests | MARKETDATA_MODULE_SLOT | main | | MARKETDATA_CONNECTION_CLASS | org.teiid.resource.adapter.file.FileManagedConnectionFactory | | MARKETDATA_CONNECTION_JNDI | java:/marketdata-file | - | MARKETDATA_PROPERTY_ParentDirectory | /home/jboss/source/data/teiidfiles/data | + | MARKETDATA_PROPERTY_ParentDirectory | /opt/eap/standalone/data/teiidfiles/data | | MARKETDATA_PROPERTY_AllowParentPaths | true | | EXCEL_ID | fileQSExcel | | EXCEL_MODULE_SLOT | main | | EXCEL_MODULE_ID | org.jboss.teiid.resource-adapter.file | | EXCEL_CONNECTION_CLASS | org.teiid.resource.adapter.file.FileManagedConnectionFactory | | EXCEL_CONNECTION_JNDI | java:/excel-file | - | EXCEL_PROPERTY_ParentDirectory | /home/jboss/source/data/teiidfiles/excelFiles/ | + | EXCEL_PROPERTY_ParentDirectory | /opt/eap/standalone/data/teiidfiles/excelFiles/ | | EXCEL_PROPERTY_AllowParentPaths | true | - | APP_DATADIR | data | + Then container log should contain JBAS015859: Deployed "portfolio-vdb.xml" + And container log should contain JBAS015859: Deployed "hibernate-portfolio-vdb.xml" + And container log should contain JBAS015874: JBoss Red Hat JBoss Data Virtualization + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value java:/accounts-ds on XPath //*[local-name()='datasource']/@jndi-name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE on XPath //*[local-name()='datasource'][@jndi-name="java:/accounts-ds"]/*[local-name()='connection-url'] + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value fileQS on XPath //*[local-name()='resource-adapter']/@id + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value org.teiid.resource.adapter.file.FileManagedConnectionFactory on XPath //*[local-name()='resource-adapter'][@id="fileQS"]/*[local-name()='connection-definitions']/*[local-name()='connection-definition']/@class-name + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value fileQSExcel on XPath //*[local-name()='resource-adapter']/@id + And XML file /opt/eap/standalone/configuration/standalone-openshift.xml should contain value AllowParentPaths on XPath //*[local-name()='resource-adapter'][@id="fileQSExcel"]/*[local-name()='connection-definitions']/*[local-name()='connection-definition']/*[local-name()='config-property']/@name + + Scenario: Test if VDBs, RAs, and datasources are deployed using custom APP_DATADIR + Given s2i build https://github.com/jboss-openshift/openshift-quickstarts from datavirt/dynamicvdb-datafederation/app with env + | variable | value | + | EAP_SECDOMAIN_NAME | eap-secdomain-name | + | DATASOURCES | ACCOUNTS | + | ACCOUNTS_DATABASE | accounts | + | ACCOUNTS_JNDI | java:/accounts-ds | + | ACCOUNTS_DRIVER | h2 | + | ACCOUNTS_JTA | true | + | ACCOUNTS_NONXA | true | + | ACCOUNTS_USERNAME | sa | + | ACCOUNTS_PASSWORD | sa | + | ACCOUNTS_URL | jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE | + | ACCOUNTS_SERVICE_HOST | dummy | + | ACCOUNTS_SERVICE_PORT | 12345 | + | RESOURCE_ADAPTERS | MARKETDATA,EXCEL | + | MARKETDATA_ID | fileQS | + | MARKETDATA_MODULE_ID | org.jboss.teiid.resource-adapter.file | + | MARKETDATA_MODULE_SLOT | main | + | MARKETDATA_CONNECTION_CLASS | org.teiid.resource.adapter.file.FileManagedConnectionFactory | + | MARKETDATA_CONNECTION_JNDI | java:/marketdata-file | + | MARKETDATA_PROPERTY_ParentDirectory | /opt/eap/standalone/data/teiidfiles/data | + | MARKETDATA_PROPERTY_AllowParentPaths | true | + | EXCEL_ID | fileQSExcel | + | EXCEL_MODULE_SLOT | main | + | EXCEL_MODULE_ID | org.jboss.teiid.resource-adapter.file | + | EXCEL_CONNECTION_CLASS | org.teiid.resource.adapter.file.FileManagedConnectionFactory | + | EXCEL_CONNECTION_JNDI | java:/excel-file | + | EXCEL_PROPERTY_ParentDirectory | /opt/eap/standalone/data/teiidfiles/excelFiles/ | + | EXCEL_PROPERTY_AllowParentPaths | true | + | APP_DATADIR | custom_datadir | Then container log should contain JBAS015859: Deployed "portfolio-vdb.xml" And container log should contain JBAS015859: Deployed "hibernate-portfolio-vdb.xml" And container log should contain JBAS015874: JBoss Red Hat JBoss Data Virtualization