From c8a97bce56677612d63d63da3a814e4501a4a38a Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 7 Sep 2022 16:17:24 +0100 Subject: Fix CSITs in honolulu release Copy certs into Honolulu. Issue-ID: POLICY-4350 Change-Id: I4cd999d006fb0cb3a75f3ae8fb4368228ca96de5 Signed-off-by: liamfallon --- csit/config/cakey.pem | 30 +++++++++++++++++++++ csit/config/careq.pem | 16 +++++++++++ csit/config/caroot.cer | 19 +++++++++++++ csit/config/drools-apps/custom/policy-keystore | Bin 5001 -> 5001 bytes csit/config/drools-apps/custom/policy-truststore | Bin 125108 -> 125108 bytes csit/config/drools/custom/policy-keystore | Bin 5001 -> 5001 bytes csit/config/drools/custom/policy-truststore | Bin 125108 -> 125108 bytes csit/config/ks.cer | 29 ++++++++++++++++++++ csit/config/ks.csr | 18 +++++++++++++ csit/config/ks.jks | Bin 5001 -> 5001 bytes csit/config/policy-truststore | Bin 125108 -> 125108 bytes ...clude-raw-integration-install-robotframework.sh | 6 ++--- csit/prepare-csit.sh | 18 ++++++------- 13 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 csit/config/cakey.pem create mode 100644 csit/config/careq.pem create mode 100644 csit/config/caroot.cer create mode 100644 csit/config/ks.cer create mode 100644 csit/config/ks.csr diff --git a/csit/config/cakey.pem b/csit/config/cakey.pem new file mode 100644 index 00000000..7ab3ba69 --- /dev/null +++ b/csit/config/cakey.pem @@ -0,0 +1,30 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIn7IXl9tp53oCAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECM9vPkP/Ay5JBIIEyIHDtrUSJOPo +OT/ZqNZ2hCxa7nwJUPAE09elPML75FGLXFuKmZXSEKMsC5peGvFVBE0B1mRUVWob +CJQ8SMiMRfs8esQ7lH/MMwtVB40gjsjHgxZTcBJlzSOm26aXzm+M8TFLLrXLiN4g +bgRtdv2xESuZvb8oxz4/jysuhdVKGcsyFiOPvmC+sEwH4Np9Wb1XlKrgwNa1KIXz +SkEeqD8R5JYsn5PaVgXkC8idMXGePFR22Zp30FjF1PbXD8Mj4E8+DOTbBd1t61je +MMGQBmrhCSW/MMRc4Ae+Dpgggv1YeqDROXrJtA0tVOXMZ/S2Dx+zbVTiEyTfoXIf +3wHaMiQdavG90OQiX2QfffA8FNRf5Mhy6gPa8DmCEgYM0xdunZBju294O4rnfmzp +EIyocxfC2naICvHxRYkCSOz1M8y8X4vOOnkYYMsoKovznkGRQUBmXDox5ker4x8F +KnZpyaNsK0x3YxG9sBtQwd2HqxRsiNVEuMhCmS2GU1DKwnjW/UyyHPA0k61Y2Mph +l7K4xTxiSzk5kBIBq6UOdP1dFyt5VO8n5/heIl1Dt9F+xJomiX7aQOimKpmNTBr4 +unzNo4EZ6Xx9oO93LuybzH3zAOGat5JZ6hALHqmZ4/11+LR1Kn+vsc+VLuLnf0dR +BiXBihgec7k1paItLZmo4AeRoWoxuGxeZkDQxr/m3xpySsVW1A0NtlyfLx2Wc2a5 +SLRNJ7fGRmrxPm+46iD+um41LR47tT5umYm2gdNyvt8vk0TjU87RMaP+OzqpA+kS ++B4ep0gIX+8n2+AutTtAjm5V4dhW2lxvmJzlFA6R9rjlXuG1VupyTK729E6zPCzP +BmkRxQnLl4+RWjA+z0ODIRmvar/LJwG2NTRvigB6F5vX0h5Xh6HmiqVD/JpuANxF +zlKXLa+pxNnCuMxa7dRbG0FLYE70NTL61nyK/d5nIcbDTz3zkLdNSTE2j85TaohG +4WJE6NWpyUGqPTArG7ebWj4CDXbL+vJJsFwbisCD4B3xYtLKgKwGnea6mWBLAuLH +myE6U8Ixr8ldl91kFKJoDHcfJKh2m31sXOY3PSpCxpr1MDBvPhpcuQRVe0ees1PX +WZaW6oacsLSpjzzNY44MYxXDP+ciTM2602VVCXtt6+74NC0bvAzSIeY5lmOqTlA1 +xWSDfbZ+T7NbFpdFcjuApiyzsL41rEEnaqgWcA2ldBisQNeQut7xHjcTeFzeNyTe +Zy3e76wOi0fT5MZbsQLDcIUCW3deYgoBdeivTpMvfHnJImsKhGnO9kQGLwgSqgN8 +MU3abOhobfVtLIilYfqlm46XKFcsudL7wKrEhzx8D9vBHmN40WKu4A7oQQgmg+8Y +YZfUHDKGViIaqcieR9+6C3VQhDKLK4OBfg2g5b9bOqe6Fo+nXZI5pf/jxfP8eHXc +7xCvHbOahOy+R5LubLLxAJtQaf4X63bCJDKutJa5iCGi87rAwxh7sm0B7mkC4XpD +ont+Ose4GeiytJqqe6LlDdIjD7wQOAoBhb4DqX50tNiGa5ymBJEQ5Lq456dLUtY+ +5r7ARnBifzrKPSXqE79GNUMceI7BQlot/72WQIuD6MwBTe6FCUoNM+zMF4zzi7Ph +9MX3EFimqcL8H4x3wD1g4w== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/csit/config/careq.pem b/csit/config/careq.pem new file mode 100644 index 00000000..57b414d8 --- /dev/null +++ b/csit/config/careq.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICjDCCAXQCAQAwRzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkx +DTALBgNVBAsMBE9OQVAxFDASBgNVBAMMC3BvbGljeS5vbmFwMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAozkMogBnADQwOp36opXoqvPKwlduH6bXH40o +zVLiTKLnKIFJ2edR7npSNGLMTvnFfIKg+L/yq+mcS6tjubm07uXF/LYxf2ie2WNW +itk4GBtvqREqr6ayo+q9AJ8aq35uhHylVq8OXFYLLOAJ8hhZAcuoAy3zjVYpNzh7 +reCbIp5GtIJanR3mior5ZD2Yr/D88QoSPpdMl13ezWDxoC8EwtZp2uul6x63t8i+ +GXcy5OWOH8WMvRe6E5FJptWaMvSkDVzDZVZQnDQpmQg2Fu+N/LkV0m/dCjEB++vz +DYWpK/X1LWtX+X1ZP++Dgt+Uk9MuueN1sc+SkqcF4Wh0N6mY5wIDAQABoAAwDQYJ +KoZIhvcNAQELBQADggEBAET3HRrtAz/COoIemC8Oo6JJm2f9umM0QPq0bijUA81Z +SFvnzfNhMZnvHdsAEl/VsBlqCSA+JLrPoXYhFV9YOYMHakuMToa7okW3yPPWbZRh +grFMCfRAO1j0INHA4emLASRkbEOE+R1ngkdoFv/EX0ImcyfMo/N+ls52QIAKo5cV +/Y6P0uXPqr4yOAaDZAyTKveQGdu1++SkTpZBBNdmq352FyARpH1CTB28oTy5tpl/ +wETVCcMxi9MYET4MGQSxQga91xyntjczjWGqnMpkTe35DVl4qAdrtkZHcvgM4WQ5 +HTxc7sBCRzvEAdI7a+uG6Tb5pJ4hvwCtjuIZApzsZWU= +-----END CERTIFICATE REQUEST----- diff --git a/csit/config/caroot.cer b/csit/config/caroot.cer new file mode 100644 index 00000000..f09d7630 --- /dev/null +++ b/csit/config/caroot.cer @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIDFTCCAf0CFF9v497aX5+9X6xnUe8EUAITW8hpMA0GCSqGSIb3DQEBCwUAMEcx +CzAJBgNVBAYTAlVTMRMwEQYDVQQIDApOZXcgSmVyc2V5MQ0wCwYDVQQLDARPTkFQ +MRQwEgYDVQQDDAtwb2xpY3kub25hcDAeFw0yMjA5MDUxMzQzMDhaFw0zMjA5MDIx +MzQzMDhaMEcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApOZXcgSmVyc2V5MQ0wCwYD +VQQLDARPTkFQMRQwEgYDVQQDDAtwb2xpY3kub25hcDCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAKM5DKIAZwA0MDqd+qKV6KrzysJXbh+m1x+NKM1S4kyi +5yiBSdnnUe56UjRizE75xXyCoPi/8qvpnEurY7m5tO7lxfy2MX9ontljVorZOBgb +b6kRKq+msqPqvQCfGqt+boR8pVavDlxWCyzgCfIYWQHLqAMt841WKTc4e63gmyKe +RrSCWp0d5oqK+WQ9mK/w/PEKEj6XTJdd3s1g8aAvBMLWadrrpeset7fIvhl3MuTl +jh/FjL0XuhORSabVmjL0pA1cw2VWUJw0KZkINhbvjfy5FdJv3QoxAfvr8w2FqSv1 +9S1rV/l9WT/vg4LflJPTLrnjdbHPkpKnBeFodDepmOcCAwEAATANBgkqhkiG9w0B +AQsFAAOCAQEAaWmjOUU0XyWpt27D8U2+2OIbWyeUz9L9HBppVzcadJo1CdNR2nvK +eESF12rg5uRy8E7gOKaYw1TZ7eLiTEAX2qkRaSknn72zQ6JcmRYKAOkA0qUhXKy9 +Jq+wo3M68mO7lam7BKqADPEq6a1t/QXWchA0mpQFbLM6w0l5V8k3cZqDRBiRgU1f +CNFEGY/YlT3r28jUbuYh1WerBPxw28TkFKaoxVvJ6FkAVqu0DYSexW+Y9ewRz4kK +9tXTIWYk87Q1F4gJc1f9rvgKMMcrWkIwb1AExkf35TBlKtVwCACqgNoMnszDMMf/ +/WCpM5vmC/6YoHpX5gD9GnoEk6MkYWbxKQ== +-----END CERTIFICATE----- diff --git a/csit/config/drools-apps/custom/policy-keystore b/csit/config/drools-apps/custom/policy-keystore index 76e93921..b3603086 100644 Binary files a/csit/config/drools-apps/custom/policy-keystore and b/csit/config/drools-apps/custom/policy-keystore differ diff --git a/csit/config/drools-apps/custom/policy-truststore b/csit/config/drools-apps/custom/policy-truststore index d9730c43..0b78cafb 100644 Binary files a/csit/config/drools-apps/custom/policy-truststore and b/csit/config/drools-apps/custom/policy-truststore differ diff --git a/csit/config/drools/custom/policy-keystore b/csit/config/drools/custom/policy-keystore index 76e93921..b3603086 100644 Binary files a/csit/config/drools/custom/policy-keystore and b/csit/config/drools/custom/policy-keystore differ diff --git a/csit/config/drools/custom/policy-truststore b/csit/config/drools/custom/policy-truststore index d9730c43..0b78cafb 100644 Binary files a/csit/config/drools/custom/policy-truststore and b/csit/config/drools/custom/policy-truststore differ diff --git a/csit/config/ks.cer b/csit/config/ks.cer new file mode 100644 index 00000000..463098c7 --- /dev/null +++ b/csit/config/ks.cer @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE+jCCA+KgAwIBAgIUNDLU1bXxnW46HpC3FmOFcJungPYwDQYJKoZIhvcNAQEL +BQAwRzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkxDTALBgNVBAsM +BE9OQVAxFDASBgNVBAMMC3BvbGljeS5vbmFwMB4XDTIyMDkwNTEzNDMxMFoXDTIy +MTAwNTEzNDMxMFowYjEPMA0GA1UEAxMGcG9saWN5MSMwIQYDVQQLDBpwb2xpY3lA +cG9saWN5Lm9uYXAub3JnOkRFVjEOMAwGA1UECxMFT1NBQUYxDTALBgNVBAoTBE9O +QVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +jS6rhuIhW3O8I12CEwPqpvseVLrghXU5JnBiOhWUbVsMwbAhQvGbte5Z7k8kmPEd +c84xfpmFHl/4jP2ada/QbJIT5kIrqBcocivyXIbztnThsCWPbKFBduvvtRxTCN+X +0iSNux6vyHpfFB4PONzy/CdtRjgeO9Rbm4xYOgvvtLXGVuJ9oELMPNfVr5kFUUnv +L9F7alE0wEVC1uDnU9EmGZFnEkfLLkcTVYUtlI8xzXSf24KN6ZjGHK2m8454PuK0 +/H1a1F5M4IdseVQK/OrOPxwGVgVZAIL0NIaw0i27Lu0S4t6Wpf5MtnYZmNix/8Pp +qWeHaD5bUKVw93kigTw8PwIDAQABo4IBwTCCAb0wggEsBgNVHREEggEjMIIBH4IG +cG9saWN5ggZkcm9vbHOCC2Ryb29scy5vbmFwgg9wb2xpY3ktYXBleC1wZHCCFHBv +bGljeS1hcGV4LXBkcC5vbmFwggpwb2xpY3ktYXBpgg9wb2xpY3ktYXBpLm9uYXCC +E3BvbGljeS1kaXN0cmlidXRpb26CGHBvbGljeS1kaXN0cmlidXRpb24ub25hcIIK +cG9saWN5LXBhcIIPcG9saWN5LXBhcC5vbmFwghBwb2xpY3kteGFjbWwtcGRwghVw +b2xpY3kteGFjbWwtcGRwLm9uYXCCCXNpbXVsYXRvcoIHYWFpLXNpbYIIZ3JwYy1z +aW2CCHNkbmMtc2ltggZzby1zaW2CB3ZmYy1zaW2CDm1lc3NhZ2Utcm91dGVyMB0G +A1UdDgQWBBSznyg3j4ur3Wgde/s77TiApn3lGzBsBgNVHSMEZTBjoUukSTBHMQsw +CQYDVQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTENMAsGA1UECwwET05BUDEU +MBIGA1UEAwwLcG9saWN5Lm9uYXCCFF9v497aX5+9X6xnUe8EUAITW8hpMA0GCSqG +SIb3DQEBCwUAA4IBAQAOylfCbpJXxWdjUvdevkHvmSjBuX2IqrAohptTs/lutDFx +fm5l7ymTudg0CLPI+iYjG25ykf2ysUhxCk4VWjE6L2B4XGo6d4S1n5Gef0XDpWkA +zASUn1M22rkJWZsM55Kti6l57T++eiBzo6KjM3NzX4+a9P7ZzacrKMpNxBitq+IE +iJiY0INSlwO3kvUrqm7nWShgSQVksTzYVZHjZmVj9VaVo8Q49EIrHEpxAKgC/Y0M +dtZy6n2wvSurdcJtRMRZAows1pi3jFA/U82H3menh3dAhwr3hrRSfdjbzMg2HVeX +Z6vhpJ2xPa46US9j+sbL/6YriZOADkdcNe4C54qD +-----END CERTIFICATE----- diff --git a/csit/config/ks.csr b/csit/config/ks.csr new file mode 100644 index 00000000..6c405de1 --- /dev/null +++ b/csit/config/ks.csr @@ -0,0 +1,18 @@ +-----BEGIN NEW CERTIFICATE REQUEST----- +MIIC1zCCAb8CAQAwYjEPMA0GA1UEAxMGcG9saWN5MSMwIQYDVQQLDBpwb2xpY3lA +cG9saWN5Lm9uYXAub3JnOkRFVjEOMAwGA1UECxMFT1NBQUYxDTALBgNVBAoTBE9O +QVAxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +jS6rhuIhW3O8I12CEwPqpvseVLrghXU5JnBiOhWUbVsMwbAhQvGbte5Z7k8kmPEd +c84xfpmFHl/4jP2ada/QbJIT5kIrqBcocivyXIbztnThsCWPbKFBduvvtRxTCN+X +0iSNux6vyHpfFB4PONzy/CdtRjgeO9Rbm4xYOgvvtLXGVuJ9oELMPNfVr5kFUUnv +L9F7alE0wEVC1uDnU9EmGZFnEkfLLkcTVYUtlI8xzXSf24KN6ZjGHK2m8454PuK0 +/H1a1F5M4IdseVQK/OrOPxwGVgVZAIL0NIaw0i27Lu0S4t6Wpf5MtnYZmNix/8Pp +qWeHaD5bUKVw93kigTw8PwIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4E +FgQUs58oN4+Lq91oHXv7O+04gKZ95RswDQYJKoZIhvcNAQELBQADggEBAAwlPDBX +urNeBAuIW8whtTPeuvDxlNYyotxvgJSD1wDmdYVFTd2lE0ibyCcc/6lKr9LYyjt9 +zpN+6CQOVk2rKTstbI0ZEmAbOA4p4dFOhPBmrOTdghc30NCNuoqnnUiOGsy4fkrh +4uT46trLKhDdYlKEYWBeG3GfVyxhV1Zzf6ftf8Ab4TgFfacThpfe5cv9TLT9Nmpl +cTcd2EwuRtkx9EpK/mqKqNTO0ZHB+aJ6YsrXxErNBd1zkeD0+mdU/CFgXJw1t2G7 +bARt8ybQ/caD9gjPL9sdrmV3dbG10d0saWcJc8KqzImURmnsu+Wdzf6kcSGwuHjU +vgMUceeN155oQwg= +-----END NEW CERTIFICATE REQUEST----- diff --git a/csit/config/ks.jks b/csit/config/ks.jks index 76e93921..b3603086 100644 Binary files a/csit/config/ks.jks and b/csit/config/ks.jks differ diff --git a/csit/config/policy-truststore b/csit/config/policy-truststore index d9730c43..0b78cafb 100644 Binary files a/csit/config/policy-truststore and b/csit/config/policy-truststore differ diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh index 1fb107b6..22f71a73 100755 --- a/csit/include-raw-integration-install-robotframework.sh +++ b/csit/include-raw-integration-install-robotframework.sh @@ -2,7 +2,7 @@ # # ============LICENSE_START=================================================== # Copyright (c) 2016 The Linux Foundation and others. -# Modification Copyright 2021. Nordix Foundation. +# Modification Copyright 2021-2022 Nordix Foundation. # Modification Copyright 2021 AT&T Intellectual Property. All rights reserved. # ============================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,7 +19,7 @@ # ============LICENSE_END===================================================== # -ROBOT_VENV=$(mktemp -d --suffix=robot_venv) +ROBOT_VENV=$(mktemp -d) echo "ROBOT_VENV=${ROBOT_VENV}" >> "${WORKSPACE}/env.properties" echo "Python version is: $(python3 --version)" @@ -33,5 +33,5 @@ set -exu python3 -m pip install --upgrade pip echo "Installing Python Requirements" -python3 -m pip install -r pylibs.txt +python3 -m pip install -r ${SCRIPTS}/pylibs.txt python3 -m pip freeze diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index 9625c48b..b51e0a13 100755 --- a/csit/prepare-csit.sh +++ b/csit/prepare-csit.sh @@ -2,7 +2,7 @@ # # Copyright 2019 © Samsung Electronics Co., Ltd. # Modification Copyright 2021 © AT&T Intellectual Property. -# Modification Copyright 2021. Nordix Foundation. +# Modification Copyright 2021-2022 Nordix Foundation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,25 +20,25 @@ # if [ -z "$WORKSPACE" ]; then - export WORKSPACE=`git rev-parse --show-toplevel` + export WORKSPACE=$(git rev-parse --show-toplevel) fi # Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated, # include-raw-integration-install-robotframework.sh has already been executed -if [ -f ${WORKSPACE}/env.properties ]; then - source ${WORKSPACE}/env.properties +if [ -f "${WORKSPACE}"/env.properties ]; then + source "${WORKSPACE}"/env.properties fi -if [ -f ${ROBOT_VENV}/bin/activate ]; then - source ${ROBOT_VENV}/bin/activate +if [ -f "${ROBOT_VENV}"/bin/activate ]; then + source "${ROBOT_VENV}"/bin/activate else - source ./include-raw-integration-install-robotframework.sh + source ${SCRIPTS}/include-raw-integration-install-robotframework.sh fi # install eteutils -mkdir -p ${ROBOT_VENV}/src/onap -rm -rf ${ROBOT_VENV}/src/onap/testsuite +mkdir -p "${ROBOT_VENV}"/src/onap +rm -rf "${ROBOT_VENV}"/src/onap/testsuite python3 -m pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre python3 -m pip freeze -- cgit 1.2.3-korg