Merge "service-bridge: skip osc/kubectl things for arm64"

playbooks/service-bridge.yaml

@@ -3,10 +3,21 @@
   roles:
     - 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:

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']
 
@@ -57,6 +58,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
 
@@ -64,6 +67,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