diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index 6fee634c8..ceb2a1f57 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -83,6 +83,7 @@ jobs: - name: test external script create-external-cluster-resources.py run: | + kubectl -n rook-ceph exec $(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[0].metadata.name}') -- /bin/bash -c "echo \"$(kubectl get pods -o wide -n rook-ceph -l app=rook-ceph-mgr --no-headers=true|head -n1|awk '{print $6"\t"$1}')\" >>/etc/hosts" kubectl -n rook-ceph exec $(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[0].metadata.name}') -- mkdir -p /etc/ceph/test-data kubectl -n rook-ceph cp cluster/examples/kubernetes/ceph/test-data/ceph-status-out $(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[0].metadata.name}'):/etc/ceph/test-data/ kubectl -n rook-ceph cp cluster/examples/kubernetes/ceph/create-external-cluster-resources.py $(kubectl get pod -l app=rook-ceph-tools -n rook-ceph -o jsonpath='{.items[0].metadata.name}'):/etc/ceph diff --git a/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py b/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py index b84aa37cd..f1b17e8c6 100644 --- a/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py +++ b/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py @@ -125,7 +125,7 @@ class DummyRados(object): host_ip = self.dummy_host_ip_map.get(host_name, "") if not host_ip: host_ip = "172.9.{}.{}".format( - random.randint(0, 255), random.randint(0, 255)) + random.randint(0, 254), random.randint(0, 254)) self.dummy_host_ip_map[host_name] = host_ip del random return host_ip @@ -797,6 +797,7 @@ if __name__ == '__main__': rjObj.main() except ExecutionFailureException as err: print("Execution Failed: {}".format(err)) + raise err except KeyError as kErr: print("KeyError: %s", kErr) except OSError as osErr: