openstack
/
loci
Code Issues Proposed changes

Make py3 default 

Change-Id: Iaa3f707e48dec32aadc2f8849196990915e36451
This commit is contained in:
Andrii Ostapenko 2021-10-12 15:51:03 -06:00 committed by Andrii Ostapenko
parent a61c73e9b2
commit a2a88b8ffb
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -14,7 +14,7 @@ ARG PIP_ARGS=""
ARG PIP_WHEEL_ARGS=$PIP_ARGS ARG PIP_WHEEL_ARGS=$PIP_ARGS
ARG DIST_PACKAGES="" ARG DIST_PACKAGES=""
ARG PLUGIN=no ARG PLUGIN=no
ARG PYTHON3=no ARG PYTHON3=indeed
ARG EXTRA_BINDEP="" ARG EXTRA_BINDEP=""
ARG EXTRA_PYDEP="" ARG EXTRA_PYDEP=""
ARG REGISTRY_PROTOCOL="detect" ARG REGISTRY_PROTOCOL="detect"

8
playbooks/vars.yaml
View File

@ -32,7 +32,6 @@ distros:
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
WHEELS: 172.17.0.1:5000/loci/requirements:master-centos WHEELS: 172.17.0.1:5000/loci/requirements:master-centos
FROM: base:centos FROM: base:centos
PYTHON3: yes
requirements: requirements:
PROJECT: requirements PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
@ -54,12 +53,10 @@ distros:
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
WHEELS: 172.17.0.1:5000/loci/requirements:master-ubuntu_focal WHEELS: 172.17.0.1:5000/loci/requirements:master-ubuntu_focal
FROM: base:ubuntu_focal FROM: base:ubuntu_focal
PYTHON3: yes
requirements: requirements:
PROJECT: requirements PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
FROM: base:ubuntu_focal FROM: base:ubuntu_focal
PYTHON3: yes
- name: ubuntu_bionic - name: ubuntu_bionic
image: ubuntu:bionic image: ubuntu:bionic
release: ussuri release: ussuri
@ -76,12 +73,10 @@ distros:
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
WHEELS: 172.17.0.1:5000/loci/requirements:ussuri-ubuntu_bionic WHEELS: 172.17.0.1:5000/loci/requirements:ussuri-ubuntu_bionic
FROM: base:ubuntu_bionic FROM: base:ubuntu_bionic
PYTHON3: yes
requirements: requirements:
PROJECT: requirements PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
FROM: base:ubuntu_bionic FROM: base:ubuntu_bionic
PYTHON3: yes
- name: leap15 - name: leap15
release: master release: master
buildargs: buildargs:
@ -99,7 +94,6 @@ distros:
PROJECT: requirements PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
FROM: base:leap15 FROM: base:leap15
PYTHON3: yes
- name: debian - name: debian
image: debian:stretch image: debian:stretch
release: train release: train
@ -119,11 +113,9 @@ distros:
PROJECT_RELEASE: "train" PROJECT_RELEASE: "train"
WHEELS: 172.17.0.1:5000/loci/requirements:train-debian WHEELS: 172.17.0.1:5000/loci/requirements:train-debian
FROM: base:debian FROM: base:debian
PYTHON3: yes
requirements: requirements:
PROJECT: requirements PROJECT: requirements
PROJECT_REPO: http://172.17.0.1/git/openstack/requirements PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
PROJECT_REF: "stable/train" PROJECT_REF: "stable/train"
PROJECT_RELEASE: "train" PROJECT_RELEASE: "train"
FROM: base:debian FROM: base:debian
PYTHON3: yes