From e029a09345269a74b2514ccb3842a2397015126a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kr=C3=BCger?= Date: Tue, 30 Apr 2019 16:29:37 +0200 Subject: [PATCH] Update CI to use 2.10.0 release (#4682) * Update CI to use 2.10.0 release * Add rsync as it's required to use synchronize --- .gitlab-ci.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43442077f..1c2bb184a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ before_script: tags: - packet variables: - KUBESPRAY_VERSION: v2.9.0 + KUBESPRAY_VERSION: v2.10.0 image: quay.io/kubespray/kubespray:$KUBESPRAY_VERSION .testcases: &testcases diff --git a/Dockerfile b/Dockerfile index e2ee3f4d4..b3fb07885 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /kubespray RUN apt update -y && \ apt install -y \ libssl-dev python-dev sshpass apt-transport-https jq \ - ca-certificates curl gnupg2 software-properties-common python-pip + ca-certificates curl gnupg2 software-properties-common python-pip rsync RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ add-apt-repository \ "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ @@ -14,5 +14,5 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && && apt update -y && apt-get install docker-ce -y COPY . . RUN /usr/bin/python -m pip install pip -U && /usr/bin/python -m pip install -r tests/requirements.txt && python -m pip install -r requirements.txt -RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/linux/amd64/kubectl \ +RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \ && chmod a+x kubectl && cp kubectl /usr/local/bin/kubectl