diff --git a/ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml b/ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml index 4b8ac2cc63ff7..1025387a55e17 100644 --- a/ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml +++ b/ci-operator/config/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main.yaml @@ -14,65 +14,17 @@ build_root: tag: rhel-9-release-golang-1.25-openshift-4.22 images: items: - - dockerfile_literal: | - FROM root - ARG GH_TOKEN_VER=2.0.8 - ARG GH_TOKEN_SHA=867d9ebf7dd18e67e2599f0f890f3f41b8673e88c4394a32a05476024c41ea0f - RUN set -eu; \ - f=/tmp/gh-token.download; rm -f "$f"; \ - n=1; max=5; delay=1; \ - until curl -sSL --fail --connect-timeout 10 --max-time 120 \ - --retry 3 --retry-delay 2 \ - "https://github.com/Link-/gh-token/releases/download/v${GH_TOKEN_VER}/linux-amd64" \ - -o "$f"; do \ - rm -f "$f"; \ - [ "$n" -ge "$max" ] && exit 1; \ - sleep "$delay"; \ - delay=$((delay * 2)); \ - n=$((n+1)); \ - done; \ - echo "${GH_TOKEN_SHA} $f" | sha256sum -c -; \ - install -m 0755 "$f" /usr/local/bin/gh-token; \ - rm -f "$f" + - dockerfile_path: images/Containerfile.markdownlint from: root - to: gh-token - - dockerfile_literal: | - FROM src - USER 0:0 - COPY ghtoken/gh-token /usr/local/bin/gh-token - RUN chmod +x /usr/local/bin/gh-token - COPY . /opt/app-root/src/ - WORKDIR /opt/app-root/src/ - from: src - inputs: - gh-token: - paths: - - destination_dir: ghtoken - source_path: /usr/local/bin/gh-token - to: edge-tooling - - dockerfile_literal: | - FROM pipeline:claude-ai-helpers - USER 0:0 - COPY ghtoken/gh-token /usr/local/bin/gh-token - RUN chmod +x /usr/local/bin/gh-token - COPY repo/ /opt/app-root/src/edge-tooling - ENV EDGE_TOOLING_DIR=/opt/app-root/src/edge-tooling - WORKDIR /opt/app-root/src/edge-tooling + to: markdownlint-cli2 + - dockerfile_path: images/Containerfile.ci from: claude-ai-helpers - inputs: - gh-token: - paths: - - destination_dir: ghtoken - source_path: /usr/local/bin/gh-token - src: - paths: - - destination_dir: repo - source_path: /go/src/github.com/openshift-eng/edge-tooling/. to: edge-tooling-ai-helpers promotion: to: - additional_images: - gh-token: gh-token + edge-tooling-ai-helpers: edge-tooling-ai-helpers + markdownlint-cli2: markdownlint-cli2 excluded_images: - '*' namespace: ci @@ -82,34 +34,18 @@ resources: requests: cpu: 100m memory: 200Mi -test_binary_build_commands: |- - dnf -y module reset nodejs || true - dnf -y module enable nodejs:20 - dnf -y install nodejs - - npm install -g \ - markdownlint@v0.40.0 \ - markdownlint-cli2@v0.22.1 \ - markdownlint-cli2-formatter-json \ - markdownlint-cli2-formatter-pretty \ - markdownlint-cli2-formatter-junit tests: - always_run: false as: markdownlint - commands: | - set +e - make lint-markdown - rc=$? - if [[ -n "${ARTIFACT_DIR:-}" && -f markdownlint-cli2-junit.xml ]]; then - cp -f markdownlint-cli2-junit.xml "${ARTIFACT_DIR}/" - fi - exit "${rc}" + commands: make lint-markdown container: - from: test-bin + clone: true + from: markdownlint-cli2 run_if_changed: (\.md|^Makefile|^hack/.*markdown.*|^\.markdown.*)$ - as: shellcheck commands: make lint-shellcheck container: + clone: true from: shellcheck run_if_changed: .sh$ - as: ocp-ci-monitor diff --git a/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-postsubmits.yaml b/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-postsubmits.yaml index 89ac76ee1e119..bb12c0ede5817 100644 --- a/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-postsubmits.yaml +++ b/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-postsubmits.yaml @@ -22,7 +22,8 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] - - --target=gh-token + - --target=edge-tooling-ai-helpers + - --target=markdownlint-cli2 command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest diff --git a/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-presubmits.yaml b/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-presubmits.yaml index 40d58bcfccb2d..38dee9970b79a 100644 --- a/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-eng/edge-tooling/openshift-eng-edge-tooling-main-presubmits.yaml @@ -22,7 +22,8 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] - - --target=gh-token + - --target=edge-tooling-ai-helpers + - --target=markdownlint-cli2 command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest diff --git a/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh b/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh index a7447baccb2f5..2860cc08d6a8e 100644 --- a/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh +++ b/ci-operator/step-registry/openshift/edge-tooling/microshift-ci/doctor/openshift-edge-tooling-microshift-ci-doctor-commands.sh @@ -114,23 +114,6 @@ load_secrets() { fi } -install_prerequisites() { - # Export the PATH to include the local bin directory - export PATH="${HOME}/.local/bin:${PATH}" - - echo "Installing gcloud CLI..." - curl -sSL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-x86_64.tar.gz | tar -xz -C /tmp - /tmp/google-cloud-sdk/install.sh --quiet --path-update true - export PATH="/tmp/google-cloud-sdk/bin:${PATH}" - echo "gcloud CLI installed." - - echo "Installing Python package dependencies..." - pip install --user \ - 'uv==0.11.6' \ - 'matplotlib==3.9.4' - echo "Python package dependencies installed." -} - wait_for_mcp_status() { local -r service="$1" local -r status="$2" @@ -218,7 +201,6 @@ fi trap atexit_handler EXIT TERM INT load_secrets -install_prerequisites configure_claude # Use the edge-tooling source pre-installed in the image