From e69c88ae306eba20a364d532c0348ab3d32b0551 Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Tue, 3 May 2022 15:19:39 -0400 Subject: [PATCH] Upgrade python version on prow container to 3.9 (#156) * Upgrade python version on prow container to 3.9 * Increase integration time out * Set build python version * Fix typo --- ci/Dockerfile | 11 ++++++----- ci/incluster_integration.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index dfbd0d6..1a50919 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -4,16 +4,17 @@ ENV OPERATOR=/usr/local/bin/ansible-operator \ USER_UID=1001 \ USER_NAME=ansible-operator\ HOME=/opt/ansible \ - ANSIBLE_LOCAL_TMP=/opt/ansible/tmp + ANSIBLE_LOCAL_TMP=/opt/ansible/tmp \ + DOWNSTREAM_BUILD_PYTHON=python3.9 RUN yum install -y \ glibc-langpack-en \ git \ make \ - python3 \ - python3-devel \ - python3-pip \ - python3-setuptools \ + python39 \ + python39-devel \ + python39-pip \ + python39-setuptools \ gcc \ openldap-devel \ && pip3 install --no-cache-dir --upgrade setuptools pip \ diff --git a/ci/incluster_integration.sh b/ci/incluster_integration.sh index 1b35cfd..3d2a55d 100755 --- a/ci/incluster_integration.sh +++ b/ci/incluster_integration.sh @@ -72,7 +72,7 @@ function check_failure { return 1 } -runtime="15 minute" +runtime="30 minute" endtime=$(date -ud "$runtime" +%s) echo "Waiting for test job to complete"