From e7638526b3164fb7900755a9dee3692e236468ac Mon Sep 17 00:00:00 2001 From: micafer Date: Wed, 6 Apr 2022 16:48:50 +0200 Subject: [PATCH 1/2] Bump 1.11.1 --- IM/__init__.py | 2 +- changelog | 4 +++- docker-devel/Dockerfile | 2 +- docker-py3/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/IM/__init__.py b/IM/__init__.py index 59a728d83..4639f7092 100644 --- a/IM/__init__.py +++ b/IM/__init__.py @@ -19,7 +19,7 @@ 'InfrastructureInfo', 'InfrastructureManager', 'recipe', 'request', 'REST', 'retry', 'ServiceRequests', 'SSH', 'SSHRetry', 'timedcall', 'UnixHTTPAdapter', 'VirtualMachine', 'VMRC', 'xmlobject'] -__version__ = '1.11.0' +__version__ = '1.11.1' __author__ = 'Miguel Caballer' diff --git a/changelog b/changelog index 5ff5c5a34..e6e20b4ee 100644 --- a/changelog +++ b/changelog @@ -700,4 +700,6 @@ IM 1.11.0: * Fix error in EGI connector using appdb image url without setting site name. * Fix error getting project ids from AppDB. - +IM 1.11.1: + * Fix error in OpenStack connector setting microversion. + * Fix vo set in appdb image in EGI conn is not compared with auth data. diff --git a/docker-devel/Dockerfile b/docker-devel/Dockerfile index eb98ba4d4..d4ba4b100 100644 --- a/docker-devel/Dockerfile +++ b/docker-devel/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 ARG BRANCH=devel LABEL maintainer="Miguel Caballer " -LABEL version="1.11.0" +LABEL version="1.11.1" LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)" EXPOSE 8899 8800 diff --git a/docker-py3/Dockerfile b/docker-py3/Dockerfile index 62ebb5238..d7ccc5674 100644 --- a/docker-py3/Dockerfile +++ b/docker-py3/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile to create a container with the IM service FROM ubuntu:20.04 LABEL maintainer="Miguel Caballer " -LABEL version="1.11.0" +LABEL version="1.11.1" LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)" EXPOSE 8899 8800 @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3-setupto pip3 install pyOpenSSL cheroot xmltodict pymongo ansible==2.9.26&& \ pip3 install git+https://github.com/openstack/tosca-parser && \ pip3 install git+https://github.com/micafer/libcloud@micro && \ - pip3 install IM==1.11.0 && \ + pip3 install IM==1.11.1 && \ apt-get purge -y python3-pip git && \ apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/ From ea73ed9e9e698295c45d1f214fd775b60d0f11a1 Mon Sep 17 00:00:00 2001 From: micafer Date: Thu, 7 Apr 2022 08:32:45 +0200 Subject: [PATCH 2/2] Remove task wait apt --- contextualization/basic.yml | 5 ----- contextualization/conf-ansible.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/contextualization/basic.yml b/contextualization/basic.yml index 5bf211782..e894d98ea 100644 --- a/contextualization/basic.yml +++ b/contextualization/basic.yml @@ -15,11 +15,6 @@ ignore_errors: yes changed_when: false - - name: Wait for any possibly running unattended upgrade to finish - raw: sudo systemd-run --property="After=apt-daily.service apt-daily-upgrade.service" --wait /bin/true - ignore_errors: yes - changed_when: false - # Some OSs does not have python by default - name: Check Python2 is installed raw: python2 -c 'import sys; print(sys.version_info[1])' diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index 34a144062..390394d0f 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -25,11 +25,6 @@ ignore_errors: yes changed_when: false - - name: Wait for any possibly running unattended upgrade to finish - raw: sudo systemd-run --property="After=apt-daily.service apt-daily-upgrade.service" --wait /bin/true - ignore_errors: yes - changed_when: false - ################### Some OSs does not have python by default ######################### - name: Check Python is installed raw: python3 -c 'import sys; print(sys.version_info[1])'