summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Pedersen <michaelx.pedersen@intel.com>2021-05-04 12:05:18 +0000
committerRihab Banday <rihab.banday@ericsson.com>2021-05-04 12:12:02 +0000
commit4745a7fbc607b4944bb2daf96b150ae8dc39ef70 (patch)
tree27a550a2ae0f534c02658cfbdb6d9e45cb18e449
parent3ee88d3c28df8dcbee47b389a8ae6b0cb503b9c1 (diff)
Add workaround for cachetools version being too recent for Python 2
Signed-off-by: Michael S. Pedersen <michaelx.pedersen@intel.com> Change-Id: If819e206cd1ab84baa3f69d5ddc397bbc1fccc23 Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72477 Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org> Reviewed-by: Rihab Banday <rihab.banday@ericsson.com>
-rwxr-xr-xfunctions.sh2
-rw-r--r--sw_config/bmra/patched_packages.yml45
2 files changed, 47 insertions, 0 deletions
diff --git a/functions.sh b/functions.sh
index 3f61d3b..d16f473 100755
--- a/functions.sh
+++ b/functions.sh
@@ -249,6 +249,8 @@ cp ${PROJECT_ROOT}/${INSTALLER}/ansible.cfg \
${PROJECT_ROOT}/container-experience-kits/ansible.cfg
cp ${PROJECT_ROOT}/${INSTALLER}/patched_rhel_packages.yml \
${PROJECT_ROOT}/container-experience-kits/roles/bootstrap/install_packages/tasks/rhel.yml
+cp ${PROJECT_ROOT}/${INSTALLER}/patched_packages.yml \
+ ${PROJECT_ROOT}/container-experience-kits/roles/bootstrap/install_packages/tasks/main.yml
sudo docker run --rm \
-e ANSIBLE_CONFIG=/bmra/ansible.cfg \
diff --git a/sw_config/bmra/patched_packages.yml b/sw_config/bmra/patched_packages.yml
new file mode 100644
index 0000000..3c7256f
--- /dev/null
+++ b/sw_config/bmra/patched_packages.yml
@@ -0,0 +1,45 @@
+##
+## Copyright (c) 2020-2021 Intel Corporation.
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+---
+- name: install packages on RHEL-based distro
+ include_tasks: rhel.yml
+ when: ansible_os_family == "RedHat"
+
+- name: install packages on Debian-based distro
+ include_tasks: debian.yml
+ when: ansible_os_family == "Debian"
+
+#net_attach_def, docker registry, cmk reqs
+- name: upgrade Python wheel and setuptools
+ pip:
+ name:
+ - wheel==0.34.2
+ - setuptools<=44
+ extra_args: --upgrade
+
+#pinned python package versions
+- name: install Python packages
+ pip:
+ name:
+ - jmespath==0.9.5
+ - ruamel.yaml==0.16.13
+ - cachetools==3.1.1
+ - openshift==0.11.2
+ state: present
+ register: pip_result
+ retries: 5
+ until: pip_result is succeeded
+ delay: 5