diff options
6 files changed, 27 insertions, 28 deletions
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index 959c1cca21..51e552e975 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -18,7 +18,6 @@ SDC_CERT_DIR="onap/cert" RELEASE=latest LOCAL=false -RUNTESTS=false BE_DEBUG_PORT="--publish 4000:4000" FE_DEBUG_PORT="--publish 6000:6000" ONBOARD_DEBUG_PORT="--publish 4001:4001" @@ -78,7 +77,6 @@ function cleanup { function dir_perms { mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE - mkdir -p ${WORKSPACE}/data/logs/sdc-api-tests/ExtentReport mkdir -p ${WORKSPACE}/data/logs/ONBOARD/SDC/ONBOARD-BE mkdir -p ${WORKSPACE}/data/logs/sdc-api-tests/target @@ -86,8 +84,7 @@ function dir_perms { mkdir -p ${WORKSPACE}/data/logs/sdc-ui-tests/target mkdir -p ${WORKSPACE}/data/logs/docker_logs mkdir -p ${WORKSPACE}/data/logs/WS - echo "create dir" - echo "${WORKSPACE}/data/${SDC_CERT_DIR}" + echo "Creating dir '${WORKSPACE}/data/${SDC_CERT_DIR}'" mkdir -p ${WORKSPACE}/data/${SDC_CERT_DIR} chmod -R 777 ${WORKSPACE}/data/logs } @@ -370,7 +367,7 @@ function sdc-BE { else ADDITIONAL_ARGUMENTS=${BE_DEBUG_PORT} fi - docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env JAVA_OPTIONS="${BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8443:8443 --publish 8080:8080 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-backend:${RELEASE} + docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env JAVA_OPTIONS="${BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8443:8443 --publish 8080:8080 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-backend:${RELEASE} command_exit_status $? ${DOCKER_NAME} echo "please wait while BE is starting..." monitor_docker ${DOCKER_NAME} @@ -385,7 +382,7 @@ function sdc-BE-init { if [ ${LOCAL} = false ]; then docker pull ${PREFIX}/sdc-backend-init:${RELEASE} fi - docker run --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments ${PREFIX}/sdc-backend-init:${RELEASE} > /dev/null 2>&1 + docker run --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/BE/:${JETTY_BASE}/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments ${PREFIX}/sdc-backend-init:${RELEASE} > /dev/null 2>&1 rc=$? docker_logs ${DOCKER_NAME} if [[ ${rc} != 0 ]]; then exit ${rc}; fi @@ -404,7 +401,7 @@ function sdc-onboard-BE { else ADDITIONAL_ARGUMENTS=${ONBOARD_DEBUG_PORT} fi - docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env SDC_CLUSTER_NAME="SDC-CS-${DEP_ENV}" --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env SDC_CERT_DIR="${SDC_CERT_DIR}" --env JAVA_OPTIONS="${ONBOARD_BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/${SDC_CERT_DIR}:/var/lib/jetty/onap/cert --volume ${WORKSPACE}/data/logs/ONBOARD:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8445:8445 --publish 8081:8081 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-onboard-backend:${RELEASE} + docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env SDC_CLUSTER_NAME="SDC-CS-${DEP_ENV}" --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env SDC_CERT_DIR="${SDC_CERT_DIR}" --env JAVA_OPTIONS="${ONBOARD_BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/${SDC_CERT_DIR}:${JETTY_BASE}/onap/cert --volume ${WORKSPACE}/data/logs/ONBOARD:${JETTY_BASE}/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8445:8445 --publish 8081:8081 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-onboard-backend:${RELEASE} command_exit_status $? ${DOCKER_NAME} echo "please wait while sdc-onboard-BE is starting..." monitor_docker ${DOCKER_NAME} @@ -421,7 +418,7 @@ function sdc-FE { else ADDITIONAL_ARGUMENTS=${FE_DEBUG_PORT} fi - docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${FE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/FE/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --volume ${WORKSPACE}/data/environments/plugins-configuration.yaml:${JETTY_BASE}/config/catalog-fe/plugins-configuration.yaml --publish 9443:9443 --publish 8181:8181 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-frontend:${RELEASE} + docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${FE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/FE/:${JETTY_BASE}/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --volume ${WORKSPACE}/data/environments/plugins-configuration.yaml:${JETTY_BASE}/config/catalog-fe/plugins-configuration.yaml --publish 9443:9443 --publish 8181:8181 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-frontend:${RELEASE} command_exit_status $? ${DOCKER_NAME} echo "please wait while FE is starting....." monitor_docker ${DOCKER_NAME} @@ -492,7 +489,7 @@ function sdc-sim { --env JAVA_OPTIONS="${SIM_JAVA_OPTIONS}" \ --env ENVNAME="${DEP_ENV}" \ ${LOCAL_TIME_MOUNT_CMD} \ - --volume ${WORKSPACE}/data/logs/WS/:/var/lib/jetty/logs \ + --volume ${WORKSPACE}/data/logs/WS/:${JETTY_BASE}/logs \ --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments \ --publish 8285:8080 \ --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE} diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar Binary files differindex e5e492eef2..b4d2b3eda3 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-SNAPSHOT.csar diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-non-mano-software-information.csar b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-non-mano-software-information.csar Binary files differdeleted file mode 100644 index b4d2b3eda3..0000000000 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-pnf-1.0.1-non-mano-software-information.csar +++ /dev/null diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip Binary files differindex b0dfb2daad..fecb45aaaf 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-1.0.1-SNAPSHOT.zip diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip Binary files differindex 1c80c5fe28..676a9ff777 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/Files/PNFs/sample-signed-pnf-cms-includes-cert-1.0.1-SNAPSHOT.zip diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/cert/root.cert b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/cert/root.cert index 6bfff9e71e..11c827ac6f 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/cert/root.cert +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/files/default/cert/root.cert @@ -1,21 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDYDCCAkigAwIBAgIJALtnu4aRjdS9MA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMTkwNDMwMTEwNzI4WhcNMjkwNDI3MTEwNzI4WjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAy6B58urvKz4GbDiwcWIrfKBd7X3IG4kzn3p8Eo5Q9t47Z99HghhemfeO -Oallo1MCueB5BByi4ytw3CncQkZTiLcvqeyItO+FkxCspc37uCg5S340F8ITSQoR -XF0RiUI3h6lMGBQLi70x6nZvU+gyqBM4vrHASiNt+xQTn/pvdk9nBIQvC7g3O7x4 -5JVwX9s2XDhhkdB7pqtw/iXv/6m3EP77s3mfliub2sIeHhB71rV9NAuX49ctTJZD -yf/zEpV02LKROwaQDW8o0kzi7q8kEscdP1iO1BMLn0X15apXzXYIV9DFk1QY1mp6 -mdIg6XrxJ8ZTiaI4CETkpi6Si0JblQIDAQABo1MwUTAdBgNVHQ4EFgQUG1OniXCl -Tp3yveWrZzgNMnchfckwHwYDVR0jBBgwFoAUG1OniXClTp3yveWrZzgNMnchfckw -DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAyrHLjaV5HXrydyc4 -qHws4f5RlZxN2GkjUskJ+074F3fNNvlXd7xuqniuy5xVXmDPeFcjpOk2VgEhlZUR -6VTJc/U/oP0siEAbkmOKqllOlNYDiYobwSeQQJQXknlWUBnaRlVcmZ6dgOxmBOSU -mvYMDSUKdrbqpH55BGDK2cE9UWnfbow9Qo/Cu32CRWuRjIKf3ACssdhXu76k32KX -tefVtH/CwrdyvMEsdL+Udc+QaM2OGvWFlzj/g0Ml/oIEQQ+L1jwRExbIXOzFqRzU -ANRgN1jsWMh7HNVdXUw1gwUlPXx+sNXTMJsTRuTwchCXUly8zoGzXJnoU1PyPT9z -/3Zfrg== +MIID3zCCAsegAwIBAgIUQ7qc+oRcxS9++2Vd+ufBuSRzITkwDQYJKoZIhvcNAQEL +BQAwfzELMAkGA1UEBhMCSVIxDTALBgNVBAgMBE9OQVAxDDAKBgNVBAcMA1NEQzER +MA8GA1UECgwIT05BUC1TREMxGDAWBgNVBAMMD29yZy5vbmFwLnNkYy5jYTEmMCQG +CSqGSIb3DQEJARYXb25hcC1zZGNAbGlzdHMub25hcC5vcmcwHhcNMTkxMDI5MTE0 +MzU3WhcNMzkxMDI0MTE0MzU3WjB/MQswCQYDVQQGEwJJUjENMAsGA1UECAwET05B +UDEMMAoGA1UEBwwDU0RDMREwDwYDVQQKDAhPTkFQLVNEQzEYMBYGA1UEAwwPb3Jn +Lm9uYXAuc2RjLmNhMSYwJAYJKoZIhvcNAQkBFhdvbmFwLXNkY0BsaXN0cy5vbmFw +Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkzC40LeZGiN07u +Sy3crOkJBwulOIXHyWfWbiTbdgd0SebPccYRke3W4IQok/X/j1pNJtgdHHVcqznn +wVLcDoHjfy+wIX5EBv4zCDMAXDJ+NQE0HXOCiGGReUXVmnrZDDx30D0wgtZyvZlB +ziMhshjhVsX2OlJL4Dr33ztLnNq8NvCxsTqCVoL4N5ax7Vfi8v9JQOPletdxRfpS +UOECdpOzua+6DxWsglqKbWb0F9SWfnYRgKEqqotLDHGPKSIK9nduMLTpihqdukTN +Ud68Jp+TvhpIX47VTW5J0n9rYvjh7pTzICKjEygWcQBIUIuAsg8e9JQoyzbPV0mp +nQL4DwMCAwEAAaNTMFEwHQYDVR0OBBYEFLEM1nLbWBpDorCskxldxIXY3u2rMB8G +A1UdIwQYMBaAFLEM1nLbWBpDorCskxldxIXY3u2rMA8GA1UdEwEB/wQFMAMBAf8w +DQYJKoZIhvcNAQELBQADggEBADkYWsK8mayXAmMWll7A2VY7PIBSsoqiPAN/Vr5Y +BUD0wnAI55CN38iD6Yg1q5u380oc7OsbonwwVE1iIgf1ptg9GOMoNqGFPXGSqobE +JfYiFBCeXZHjbv9ZpF8/YnI2iqMV0dQGJ27uOYkFPv41HYLBYrtw+oULpcU+Bd18 +lK7JVvyKj7vn9oFZn880Jdrcm+u0FD35usCO090a1hXnmAftaBRqXK2F0fttit5n +yu4UU9oc/e0Z24ScXBcYRorEYc7U88D6oRTz8zPp1LIcTqxIsJigbNRTGArTJLLW +pvB8br2xl31PJ3KFTswpT8SzJN8OnuCID6Cuc4QcEzbYU7U= -----END CERTIFICATE----- |