Force to /usr/bin/python in CI

This commit is contained in:
Antoine Legrand 2018-02-12 15:32:40 +01:00
parent cb202a76df
commit c187ae22e5
4 changed files with 18 additions and 17 deletions

View file

@ -16,7 +16,7 @@ variables:
GS_ACCESS_KEY_ID: $GS_KEY GS_ACCESS_KEY_ID: $GS_KEY
GS_SECRET_ACCESS_KEY: $GS_SECRET GS_SECRET_ACCESS_KEY: $GS_SECRET
CONTAINER_ENGINE: docker CONTAINER_ENGINE: docker
SSH_USER: $GCE_USER SSH_USER: root
GCE_PREEMPTIBLE: "false" GCE_PREEMPTIBLE: "false"
ANSIBLE_KEEP_REMOTE_FILES: "1" ANSIBLE_KEEP_REMOTE_FILES: "1"
ANSIBLE_CONFIG: ./tests/ansible.cfg ANSIBLE_CONFIG: ./tests/ansible.cfg
@ -34,14 +34,14 @@ variables:
# us-west1-a # us-west1-a
before_script: before_script:
- pip install -r tests/requirements.txt - /usr/bin/python -m pip install -r tests/requirements.txt
- mkdir -p /.ssh - mkdir -p /.ssh
.job: &job .job: &job
tags: tags:
- kubernetes - kubernetes
- docker - docker
image: quay.io/kubespray/kubespray:master image: quay.io/kubespray/kubespray:latest
.docker_service: &docker_service .docker_service: &docker_service
services: services:
@ -61,6 +61,7 @@ before_script:
.do_variableS: &do_variables .do_variableS: &do_variables
PRIVATE_KEY: $DO_PRIVATE_KEY PRIVATE_KEY: $DO_PRIVATE_KEY
CI_PLATFORM: "do" CI_PLATFORM: "do"
SSH_USER: root
.testcases: &testcases .testcases: &testcases
@ -73,7 +74,8 @@ before_script:
- $HOME/.cache - $HOME/.cache
before_script: before_script:
- docker info - docker info
- pip install -r tests/requirements.txt - /usr/bin/python -m pip install -r requirements.txt
- /usr/bin/python -m pip install -r tests/requirements.txt
- mkdir -p /.ssh - mkdir -p /.ssh
- mkdir -p $HOME/.ssh - mkdir -p $HOME/.ssh
- ansible-playbook --version - ansible-playbook --version

View file

@ -1,17 +1,16 @@
FROM python:2.7.14-stretch FROM ubuntu:16.04
RUN mkdir /kubespray RUN mkdir /kubespray
WORKDIR /kubespray WORKDIR /kubespray
RUN apt update -y && \ RUN apt update -y && \
apt install -y \ apt install -y \
libssl-dev python-dev sshpass apt-transport-https \ libssl-dev python-dev sshpass apt-transport-https \
ca-certificates curl gnupg2 software-properties-common ca-certificates curl gnupg2 software-properties-common python-pip
RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | apt-key add - && \ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
add-apt-repository \ add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") \ "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
$(lsb_release -cs) \ $(lsb_release -cs) \
stable" \ stable" \
&& apt update -y && apt-get install docker-ce -y && apt update -y && apt-get install docker-ce -y
COPY . . COPY . .
RUN pip install -r tests/requirements.txt && pip install -r requirements.txt 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

View file

@ -5,10 +5,9 @@ $(HOME)/.ssh/id_rsa:
init-gce: $(HOME)/.ssh/id_rsa init-gce: $(HOME)/.ssh/id_rsa
# echo $(GCE_PEM_FILE) | base64 -d > $(HOME)/.ssh/gce # echo $(GCE_PEM_FILE) | base64 -d > $(HOME)/.ssh/gce
echo "$(GCE_CREDENTIALS_B64)" > $(HOME)/.ssh/gce.json echo "$(GCE_CREDENTIALS_B64)" | base64 -d > $(HOME)/.ssh/gce.json
init-do: $(HOME)/.ssh/id_rsa init-do: $(HOME)/.ssh/id_rsa
pip install dopy==0.3.5
echo $(DO_PRIVATE_KEY) | base64 -d > $(HOME)/.ssh/id_rsa echo $(DO_PRIVATE_KEY) | base64 -d > $(HOME)/.ssh/id_rsa
create-gce: init-gce create-gce: init-gce
@ -43,7 +42,7 @@ create-do: init-do
delete-do: delete-do:
ansible-playbook -i ../inventory/sample/hosts.ini cloud_playbooks/create-do.yml -c local \ ansible-playbook -i ../inventory/sample/hosts.ini cloud_playbooks/create-do.yml -c local \
$LOG_LEVEL \ $(LOG_LEVEL) \
-e @"files/${CI_JOB_NAME}.yml" \ -e @"files/${CI_JOB_NAME}.yml" \
-e state=absent \ -e state=absent \
-e test_id=${TEST_ID} \ -e test_id=${TEST_ID} \

View file

@ -3,3 +3,4 @@ yamllint
apache-libcloud==2.2.1 apache-libcloud==2.2.1
boto==2.9.0 boto==2.9.0
tox tox
dopy