From 1dd20260873f712dc800f2039c9b0b376fc82b0a Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 7 May 2020 13:55:24 +1000 Subject: [PATCH] service-bridge: skip osc/kubectl things for arm64 There's no clients for arm64 at this time, skip. Change-Id: I0783a9d2b06c76072dd2e9234a8a794ca0594204 --- playbooks/service-bridge.yaml | 17 ++++++++++++++--- testinfra/test_bridge.py | 7 ++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/playbooks/service-bridge.yaml b/playbooks/service-bridge.yaml index 8d6c5f0231..d9039659fa 100644 --- a/playbooks/service-bridge.yaml +++ b/playbooks/service-bridge.yaml @@ -4,10 +4,21 @@ - cloud-launcher-cron - edit-secrets-script - install-docker - - install-osc-container - - install-kubectl - - configure-kubectl tasks: + # Skip as no arm64 support available; only used for gate testing, + # where we can't mix arm64 and x86 nodes, so need a minimally + # working bridge to drive the tests for mirrors/nodepool + # etc. things. + - name: Install openshift/kubectl + when: ansible_architecture != 'aarch64' + block: + - include_role: + name: install-osc-container + - include_role: + name: install-kubectl + - include_role: + name: configure-kubectl + - include_role: name: configure-openstacksdk vars: diff --git a/testinfra/test_bridge.py b/testinfra/test_bridge.py index e0b023bf45..e428c7d13d 100644 --- a/testinfra/test_bridge.py +++ b/testinfra/test_bridge.py @@ -11,7 +11,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +import platform +import pytest testinfra_hosts = ['bridge.openstack.org'] @@ -63,6 +64,8 @@ def test_ara(host): def test_kube_config(host): + if platform.machine() != 'x86_64': + pytest.skip() kubeconfig = host.file('/root/.kube/config') assert kubeconfig.exists @@ -70,6 +73,8 @@ def test_kube_config(host): def test_kubectl(host): + if platform.machine() != 'x86_64': + pytest.skip() kube = host.run('kubectl help') assert kube.rc == 0