Fix OpenSUSE image build

Upgrades Deckhand to revision supporting six 1.12.0
https://review.opendev.org/#/c/677272/

Installs python3 and overrides python3-six version in OpenSUSE image

Reenables OpenSUSE image build gate

Change-Id: Id72dad8e3668d77b06aa8af4278fcdff0cb678eb
This commit is contained in:
Ian H Pittwood 2019-08-16 08:39:11 -05:00 committed by Ian Pittwood
parent f91ed2ec68
commit 33d650c614
6 changed files with 14 additions and 18 deletions

View File

@ -87,7 +87,6 @@
- job: - job:
name: airship-pegleg-docker-build-gate-opensuse name: airship-pegleg-docker-build-gate-opensuse
voting: false
timeout: 1800 timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node nodeset: airship-pegleg-single-node
@ -140,7 +139,6 @@
- job: - job:
name: airship-pegleg-docker-publish-opensuse name: airship-pegleg-docker-publish-opensuse
voting: false
timeout: 1800 timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: airship-pegleg-single-node nodeset: airship-pegleg-single-node

View File

@ -25,7 +25,7 @@ python-dateutil = "~=2.7.3"
GitPython = "~=2.1.11" GitPython = "~=2.1.11"
docker = ">=3.7.2" docker = ">=3.7.2"
PyYAML = "~=5.1" PyYAML = "~=5.1"
deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "a4850f8c4fc02dd1971282c6d9e4beb9cd5be320"} deckhand = {git = "https://opendev.org/airship/deckhand.git",ref = "ecc7b834edf0278c935379e1ef54b9a2fe6a40ff"}
shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "9c5f68cf97585a86c9edfc3b24545b36bdd90e14",subdirectory = "src/bin/shipyard_client"} shipyard-client = {git = "https://opendev.org/airship/shipyard.git",ref = "9c5f68cf97585a86c9edfc3b24545b36bdd90e14",subdirectory = "src/bin/shipyard_client"}
promenade = {git = "https://opendev.org/airship/promenade.git",ref = "89f9842b2ec428709a05fd0a8d4cd1796043375d"} promenade = {git = "https://opendev.org/airship/promenade.git",ref = "89f9842b2ec428709a05fd0a8d4cd1796043375d"}
oslo-utils = "~=3.41.0" oslo-utils = "~=3.41.0"

18
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "6d63b640e52a88bf1a5424ed1c2248246e720a9aeec666ed659c74046948bd5a" "sha256": "b66461ab43a0a4969486776092dd6103e5bc4f7698f65a4bcb172858be9d7689"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@ -119,7 +119,7 @@
}, },
"deckhand": { "deckhand": {
"git": "https://opendev.org/airship/deckhand.git", "git": "https://opendev.org/airship/deckhand.git",
"ref": "a4850f8c4fc02dd1971282c6d9e4beb9cd5be320" "ref": "ecc7b834edf0278c935379e1ef54b9a2fe6a40ff"
}, },
"docker": { "docker": {
"hashes": [ "hashes": [
@ -401,13 +401,6 @@
], ],
"version": "==4.5.4" "version": "==4.5.4"
}, },
"ddt": {
"hashes": [
"sha256:474546b4020ce8a2f9550ba8899c28aa2c284c7bbf175bddede98be949d1ca7c",
"sha256:d13e6af8f36238e89d00f4ebccf2bda4f6d1878be560a6600689e42077e164e3"
],
"version": "==1.2.1"
},
"execnet": { "execnet": {
"hashes": [ "hashes": [
"sha256:0dd40ad3b960aae93bdad7fe1c3f049bbcc8fba47094655a4301f5b33e906816", "sha256:0dd40ad3b960aae93bdad7fe1c3f049bbcc8fba47094655a4301f5b33e906816",
@ -466,6 +459,7 @@
"sha256:23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8", "sha256:23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8",
"sha256:80d2de76188eabfbfcf27e6a37342c2827801e59c4cc14b0371c56fed43820e3" "sha256:80d2de76188eabfbfcf27e6a37342c2827801e59c4cc14b0371c56fed43820e3"
], ],
"markers": "python_version < '3.8'",
"version": "==0.19" "version": "==0.19"
}, },
"mccabe": { "mccabe": {
@ -533,11 +527,11 @@
}, },
"pytest": { "pytest": {
"hashes": [ "hashes": [
"sha256:6ef6d06de77ce2961156013e9dff62f1b2688aa04d0dc244299fe7d67e09370d", "sha256:95b1f6db806e5b1b5b443efeb58984c24945508f93a866c1719e1a507a957d7c",
"sha256:a736fed91c12681a7b34617c8fcefe39ea04599ca72c608751c31d89579a3f77" "sha256:c3d5020755f70c82eceda3feaf556af9a341334414a8eca521a18f463bcead88"
], ],
"index": "pypi", "index": "pypi",
"version": "==5.0.1" "version": "==5.1.1"
}, },
"pytest-cov": { "pytest-cov": {
"hashes": [ "hashes": [

View File

@ -22,12 +22,16 @@ RUN set -x \
gcc \ gcc \
git-core \ git-core \
openssh \ openssh \
python3 \
python3-dbm \ python3-dbm \
python3-devel \ python3-devel \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
which \ which \
&& python3 -m pip install -U pip \ && zypper --non-interactive ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.1/devel:languages:python.repo \
&& zypper --non-interactive --gpg-auto-import-keys refresh devel_languages_python \
&& zypper --non-interactive install python3-six-1.12.0-lp151.80.1.noarch
RUN pip3 install -U pip \
&& zypper clean -a \ && zypper clean -a \
&& rm -rf \ && rm -rf \
/tmp/* \ /tmp/* \

View File

@ -8,7 +8,7 @@ click==7.0
cryptography==2.3.1 cryptography==2.3.1
debtcollector==1.21.0 debtcollector==1.21.0
docker==4.0.2 docker==4.0.2
git+https://opendev.org/airship/deckhand.git@a4850f8c4fc02dd1971282c6d9e4beb9cd5be320#egg=deckhand git+https://opendev.org/airship/deckhand.git@ecc7b834edf0278c935379e1ef54b9a2fe6a40ff#egg=deckhand
git+https://opendev.org/airship/promenade.git@89f9842b2ec428709a05fd0a8d4cd1796043375d#egg=promenade git+https://opendev.org/airship/promenade.git@89f9842b2ec428709a05fd0a8d4cd1796043375d#egg=promenade
git+https://opendev.org/airship/shipyard.git@9c5f68cf97585a86c9edfc3b24545b36bdd90e14#egg=shipyard-client&subdirectory=src/bin/shipyard_client git+https://opendev.org/airship/shipyard.git@9c5f68cf97585a86c9edfc3b24545b36bdd90e14#egg=shipyard-client&subdirectory=src/bin/shipyard_client
gitdb2==2.0.5 gitdb2==2.0.5

View File

@ -1,3 +1,3 @@
DECKHAND_VERSION=commit/a4850f8c4fc02dd1971282c6d9e4beb9cd5be320 DECKHAND_VERSION=commit/ecc7b834edf0278c935379e1ef54b9a2fe6a40ff
SHIPYARD_VERSION=commit/9c5f68cf97585a86c9edfc3b24545b36bdd90e14 SHIPYARD_VERSION=commit/9c5f68cf97585a86c9edfc3b24545b36bdd90e14
PROMENADE_VERSION=commit/89f9842b2ec428709a05fd0a8d4cd1796043375d PROMENADE_VERSION=commit/89f9842b2ec428709a05fd0a8d4cd1796043375d