diff options
| author |   arkadiusz.adamski <aadamski@est.tech> | 2021-06-03 16:09:29 +0100 |
|---|---|---|
| committer |   Jim Hahn <jrh3@att.com> | 2021-06-04 11:13:20 -0400 |
| commit | 7c7f09a88b5095a570ee22bf7dd32e1f2fe5f26c (patch) | |
| tree | 6bbdb5a9375d57b3841c89c47bf7758f3c0ee470 | |
| parent | 58fcc9268a667348d45cf338da686d12cfcf8064 (diff) | |
Use local version of the include script
- Use local version of the include-raw-integration-install-robotframework.sh script
- correct name of pip python module
Fixed conflict in cherry pick:
- prepare-csit.sh
Issue-ID: POLICY-3092
Signed-off-by: arkadiusz.adamski <aadamski@est.tech>
Change-Id: Iba43621b3c8aebfa715cee91a75fd6832ccbc2be
(cherry picked from commit 8f44cb7dc7737433324083c0c307bf954d535200)
Signed-off-by: Jim Hahn <jrh3@att.com>
| -rw-r--r-- | csit/include-raw-integration-install-robotframework.sh | 4 | ||||
| -rwxr-xr-x | csit/prepare-csit.sh | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh index 65b838b1..8375e736 100644 --- a/csit/include-raw-integration-install-robotframework.sh +++ b/csit/include-raw-integration-install-robotframework.sh @@ -26,9 +26,9 @@ source "${ROBOT_VENV}/bin/activate" set -exu # Make sure pip3 itself us up-to-date. -python3 -m pip3 install --upgrade pip3 +python3 -m pip install --upgrade pip echo "Installing Python Requirements" -python3 -m pip3 install -r pylibs.txt +python3 -m pip install -r pylibs.txt odltools -V pip3 freeze diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index 4297696f..e154a12b 100755 --- a/csit/prepare-csit.sh +++ b/csit/prepare-csit.sh @@ -24,8 +24,7 @@ if [ -z "$WORKSPACE" ]; then fi # Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated, -# ci-management/jjb/integration/include-raw-integration-install-robotframework.sh has already -# been executed +# include-raw-integration-install-robotframework.sh has already been executed if [ -f ${WORKSPACE}/env.properties ]; then source ${WORKSPACE}/env.properties @@ -33,11 +32,7 @@ fi if [ -f ${ROBOT_VENV}/bin/activate ]; then source ${ROBOT_VENV}/bin/activate else - rm -rf /tmp/ci-management - rm -f ${WORKSPACE}/env.properties - cd /tmp - git clone -b master --single-branch https://github.com/onap/ci-management.git - source /tmp/ci-management/jjb/integration/include-raw-integration-install-robotframework.sh + source ./include-raw-integration-install-robotframework.sh fi |