US59249 #77
US59249 #77
Conversation
anubhavi25
left a comment
There was a problem hiding this comment.
Looks like we forgot to remove common systemPropertyVariables from the acceptance profile?
| <ACS_CF_DOMAIN>${acs.cf.domain}</ACS_CF_DOMAIN> | ||
| <ACS_DEFAULT_ISSUER_ID>${ACS_DEFAULT_ISSUER_ID}</ACS_DEFAULT_ISSUER_ID> | ||
| <ACS_SERVICE_ID>predix-acs</ACS_SERVICE_ID> | ||
| <ACS_URL>https://${acs.appname}.${cf.base.domain}</ACS_URL> |
There was a problem hiding this comment.
ACS_URL should be moved out to the systemPropertyVariables section of the common maven-failsafe-plugin configuration you have towards the beginning of the file (since it's also common to every profile)
| <ACS_CF_DOMAIN>${acs.cf.domain}</ACS_CF_DOMAIN> | ||
| <ACS_DEFAULT_ISSUER_ID>${ACS_DEFAULT_ISSUER_ID}</ACS_DEFAULT_ISSUER_ID> | ||
| <ACS_SERVICE_ID>predix-acs</ACS_SERVICE_ID> | ||
| <ACS_URL>https://${acs.appname}.${cf.base.domain}</ACS_URL> |
There was a problem hiding this comment.
ACS_URL should be moved out to the systemPropertyVariables section of the common maven-failsafe-plugin configuration you have towards the beginning of the file (since it's also common to every profile)
f60177b to
76749c6
Compare
|
@anubhavi25 |
acs-integration-tests/pom.xml
Outdated
| <http.nonProxyHosts>${NON_PROXY_HOSTS}</http.nonProxyHosts> | ||
| <https.proxyHost>${HTTPS_PROXY_HOST}</https.proxyHost> | ||
| <https.proxyPort>${HTTPS_PROXY_PORT}</https.proxyPort> | ||
| <ZAC_URL>http://localhost:8888</ZAC_URL> |
There was a problem hiding this comment.
This can be removed since it should pull the ZAC_URL property value from the common set of properties defined above
acs-integration-tests/pom.xml
Outdated
| <http.nonProxyHosts>${NON_PROXY_HOSTS}</http.nonProxyHosts> | ||
| <https.proxyHost>${HTTPS_PROXY_HOST}</https.proxyHost> | ||
| <https.proxyPort>${HTTPS_PROXY_PORT}</https.proxyPort> | ||
| <ZAC_URL>http://localhost:8888</ZAC_URL> |
There was a problem hiding this comment.
This can be removed since it should pull the ZAC_URL property value from the common set of properties defined above
|
|
||
| function usage { | ||
| echo "Usage: source ./$( basename "$( readlink -f "${BASH_SOURCE[0]}" )" ) [-s <maven_settings_file>]" | ||
| echo "Usage: source ./$( basename "$( python -c "import os; print os.path.abspath('${BASH_SOURCE[0]}')" )" ) [-s <maven_settings_file>]" |
There was a problem hiding this comment.
These changes should not be here since a rebase doesn't introduce a merge commit. Should be correctable via a git reset --hard back to the commit one before the erroneous merge commit and force-pushing?
| export DB_USERNAME='postgres' | ||
| export DB_PASSWORD='postgres' | ||
| export DIR=$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" ) | ||
| export DIR=$( dirname "$( python -c "import os; print os.path.abspath('${BASH_SOURCE[0]}')" )" ) |
There was a problem hiding this comment.
See comment above re. the erroneous merge commit
|
|
||
| export SPRING_PROFILES_ACTIVE='h2,predix,simple-cache,titan' | ||
| export DIR=$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" ) | ||
| export DIR=$( dirname "$( python -c "import os; print os.path.abspath('${BASH_SOURCE[0]}')" )" ) |
There was a problem hiding this comment.
See comment above re. the erroneous merge commit
|
|
||
| export SPRING_PROFILES_ACTIVE='h2,public,simple-cache,titan' | ||
| export DIR=$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" ) | ||
| export DIR=$( dirname "$( python -c "import os; print os.path.abspath('${BASH_SOURCE[0]}')" )" ) |
There was a problem hiding this comment.
See comment above re. the erroneous merge commit
|
|
||
| export SPRING_PROFILES_ACTIVE='h2,public,simple-cache' | ||
| export DIR=$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" ) | ||
| export DIR=$( dirname "$( python -c "import os; print os.path.abspath('${BASH_SOURCE[0]}')" )" ) |
There was a problem hiding this comment.
See comment above re. the erroneous merge commit
| source ./set-env-local.sh | ||
|
|
||
| export DIR=$( dirname "$( readlink -f "${BASH_SOURCE[0]}" )" ) | ||
| export DIR=$( dirname "$( python -c "import os; print os.path.abspath('${BASH_SOURCE[0]}')" )" ) |
There was a problem hiding this comment.
See comment above re. the erroneous merge commit
|
|
||
| # Assumes GNU sed | ||
| sed -i "s/localhost:[0-9]\+\/uaa/localhost:${UAA_LOCAL_PORT}\/uaa/" ./acs-integration-tests/uaa/config/login.yml | ||
| python <<EOF |
There was a problem hiding this comment.
See comment above re. the erroneous merge commit
|
|
|
|
|
|
|
|
|
All Passed |
|
Approved by @FrankGasparovic |
No description provided.