diff options
| author |   Rihab Banday <rihab.banday@ericsson.com> | 2021-04-29 10:18:32 +0200 |
|---|---|---|
| committer |   Michael Pedersen <michaelx.pedersen@intel.com> | 2021-05-04 07:58:23 +0000 |
| commit | 69a9aefa68d69523e469d10c53a87524c77aeff4 (patch) | |
| tree | 4534ecb265279630e85885d7670e9531329f937a | |
| parent | 76243b0baeaa427fa4042d92b1aef0a0dc7835d9 (diff) | |
Update BMRA image and pip version for CentOS7
This change updates the BMRA image to v21.03 and
the pip version to the recommended one.
Change-Id: I28b69fcb105cac05fbcc2d4606714c9fd9be0cc4
Signed-off-by: Rihab Banday <rihab.banday@ericsson.com>
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72438
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Michael Pedersen <michaelx.pedersen@intel.com>
| -rwxr-xr-x | functions.sh | 2 | ||||
| -rw-r--r-- | sw_config/bmra/Dockerfile | 2 | ||||
| -rw-r--r-- | sw_config/bmra/patched_rhel_packages.yml | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/functions.sh b/functions.sh index 6740ca2..3f61d3b 100755 --- a/functions.sh +++ b/functions.sh @@ -254,7 +254,7 @@ sudo docker run --rm \ -e ANSIBLE_CONFIG=/bmra/ansible.cfg \ -e PROFILE=${BMRA_PROFILE} \ -v ${PROJECT_ROOT}/container-experience-kits:/bmra \ --v ~/.ssh/:/root/.ssh/ rihabbanday/bmra2.0-install:centos \ +-v ~/.ssh/:/root/.ssh/ rihabbanday/bmra21.03-install:centos \ ${ansible_cmd} EOF } diff --git a/sw_config/bmra/Dockerfile b/sw_config/bmra/Dockerfile index 97442d8..4ea0f35 100644 --- a/sw_config/bmra/Dockerfile +++ b/sw_config/bmra/Dockerfile @@ -6,7 +6,7 @@ RUN yum -y update && \ yum -y install git epel-release python36 python-netaddr && \ yum -y install python-pip && \ pip install --no-cache-dir pip==9.0.3 && \ - pip install --no-cache-dir ansible==2.9.6 jmespath && \ + pip install --no-cache-dir ansible==2.9.17 jmespath && \ pip install --no-cache-dir jinja2 --upgrade CMD ["bash"] diff --git a/sw_config/bmra/patched_rhel_packages.yml b/sw_config/bmra/patched_rhel_packages.yml index 7e65484..990f5dc 100644 --- a/sw_config/bmra/patched_rhel_packages.yml +++ b/sw_config/bmra/patched_rhel_packages.yml @@ -224,3 +224,11 @@ - jq state: present when: ansible_distribution in ["RedHat", "CentOS"] + +- name: use the correct pip version for CentOS 7 + pip: + name: + - pip==9.0.3 + when: + - ansible_distribution == "CentOS" + - ansible_distribution_version < '7.9' |