From 2ae01ab6bca8732df4ec31e7c109a996fdc1f4f9 Mon Sep 17 00:00:00 2001 From: Sven Anderson Date: Wed, 20 Oct 2021 00:21:16 +0900 Subject: [PATCH] CI: remove castxml from scripts and docs Signed-off-by: Sven Anderson --- docs/development.md | 2 +- entrypoint.sh | 16 +++++++--------- testing/containers/ceph/Dockerfile | 1 - 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/development.md b/docs/development.md index fa40718..d048b0d 100644 --- a/docs/development.md +++ b/docs/development.md @@ -242,7 +242,7 @@ require `gofmt` as well as [revive](https://github.com/mgechev/revive). A custom tool called `implements` is available under `contrib/implements`. This tool is designed to help compare what is available in ceph vs. go-ceph. It checks both the "Implements" sections in the comments as well as the code -itself. It requires the [castxml](https://github.com/CastXML/CastXML) CLI tool. +itself. ## Contribution Guidelines diff --git a/entrypoint.sh b/entrypoint.sh index 8a11c31..856cc60 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -241,15 +241,13 @@ pre_all_tests() { } implements_tool() { - if command -v castxml >/dev/null ; then - mkdir -p "${RESULTS_DIR}" - show ./implements --list \ - --report-json "${RESULTS_DIR}/implements.json" \ - --report-text "${RESULTS_DIR}/implements.txt" \ - cephfs rados rbd cephfs/admin rbd/admin rgw/admin common/admin/manager - # output the brief summary info onto stdout - grep '^[A-Z]' "${RESULTS_DIR}/implements.txt" - fi + mkdir -p "${RESULTS_DIR}" + show ./implements --list \ + --report-json "${RESULTS_DIR}/implements.json" \ + --report-text "${RESULTS_DIR}/implements.txt" \ + cephfs rados rbd cephfs/admin rbd/admin rgw/admin common/admin/manager + # output the brief summary info onto stdout + grep '^[A-Z]' "${RESULTS_DIR}/implements.txt" } post_all_tests() { diff --git a/testing/containers/ceph/Dockerfile b/testing/containers/ceph/Dockerfile index 022381d..d37c6ae 100644 --- a/testing/containers/ceph/Dockerfile +++ b/testing/containers/ceph/Dockerfile @@ -20,7 +20,6 @@ RUN true && \ git wget curl make \ /usr/bin/cc /usr/bin/c++ \ "libcephfs-devel-${cv}" "librados-devel-${cv}" "librbd-devel-${cv}" && \ - (dnf install -y 'castxml >= 0.4.3' || true) && \ yum clean all && \ true