From 16c3d76f5fcae24041c13d1f45fdf13260f2f9d8 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Tue, 20 Sep 2022 20:30:00 +0000 Subject: [PATCH] Cleanup: Remove old, deprecated and no longer used files Most of these are artifacts of previous developer tools or infra. BUG=None TEST=None Change-Id: Iff379ec786e85c3ea2e89ae3c6100fa2de9422d3 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3905069 Reviewed-by: Daniel Verkamp Commit-Queue: Dennis Kempin --- .github/workflows/gh-pages.yml | 37 ---------- PRESUBMIT.cfg | 4 +- bin/clippy | 6 -- bin/fmt | 6 -- ci/kokoro/build-aarch64.sh | 8 --- ci/kokoro/build-armhf.sh | 8 --- ci/kokoro/build-chromeos.sh | 87 ------------------------ ci/kokoro/build-merge-into-chromeos.sh | 46 ------------- ci/kokoro/build-push-to-github.sh | 10 --- ci/kokoro/build-x86_64-direct.sh | 9 --- ci/kokoro/build-x86_64.sh | 15 ---- ci/kokoro/common.cfg | 9 --- ci/kokoro/common.sh | 81 ---------------------- ci/kokoro/continuous-aarch64.cfg | 3 - ci/kokoro/continuous-armhf.cfg | 3 - ci/kokoro/continuous-chromeos.cfg | 6 -- ci/kokoro/continuous-x86_64-direct.cfg | 3 - ci/kokoro/continuous-x86_64.cfg | 3 - ci/kokoro/merge-into-chromeos.cfg | 3 - ci/kokoro/presubmit-cq-aarch64.cfg | 3 - ci/kokoro/presubmit-cq-armhf.cfg | 3 - ci/kokoro/presubmit-cq-x86_64-direct.cfg | 3 - ci/kokoro/presubmit-cq-x86_64.cfg | 3 - ci/kokoro/presubmit-cr-aarch64.cfg | 3 - ci/kokoro/presubmit-cr-armhf.cfg | 3 - ci/kokoro/presubmit-cr-x86_64-direct.cfg | 3 - ci/kokoro/presubmit-cr-x86_64.cfg | 3 - ci/kokoro/push-to-github.cfg | 13 ---- ci/kokoro/simulate.py | 55 --------------- ci/kokoro/windows/common.cfg | 9 --- ci/kokoro/windows/continuous-windows.cfg | 3 - ci/kokoro/windows/crosvm_build.bat | 53 --------------- ci/kokoro/windows/presubmit-windows.cfg | 3 - navbar.md | 6 -- run_tests | 5 -- setup_cros_cargo.sh | 7 -- test_all | 5 -- unblocked_terms.txt | 10 --- 38 files changed, 1 insertion(+), 539 deletions(-) delete mode 100644 .github/workflows/gh-pages.yml delete mode 100755 bin/clippy delete mode 100755 bin/fmt delete mode 100755 ci/kokoro/build-aarch64.sh delete mode 100755 ci/kokoro/build-armhf.sh delete mode 100755 ci/kokoro/build-chromeos.sh delete mode 100755 ci/kokoro/build-merge-into-chromeos.sh delete mode 100755 ci/kokoro/build-push-to-github.sh delete mode 100755 ci/kokoro/build-x86_64-direct.sh delete mode 100755 ci/kokoro/build-x86_64.sh delete mode 100644 ci/kokoro/common.cfg delete mode 100755 ci/kokoro/common.sh delete mode 100644 ci/kokoro/continuous-aarch64.cfg delete mode 100644 ci/kokoro/continuous-armhf.cfg delete mode 100644 ci/kokoro/continuous-chromeos.cfg delete mode 100644 ci/kokoro/continuous-x86_64-direct.cfg delete mode 100644 ci/kokoro/continuous-x86_64.cfg delete mode 100644 ci/kokoro/merge-into-chromeos.cfg delete mode 100644 ci/kokoro/presubmit-cq-aarch64.cfg delete mode 100644 ci/kokoro/presubmit-cq-armhf.cfg delete mode 100644 ci/kokoro/presubmit-cq-x86_64-direct.cfg delete mode 100644 ci/kokoro/presubmit-cq-x86_64.cfg delete mode 100644 ci/kokoro/presubmit-cr-aarch64.cfg delete mode 100644 ci/kokoro/presubmit-cr-armhf.cfg delete mode 100644 ci/kokoro/presubmit-cr-x86_64-direct.cfg delete mode 100644 ci/kokoro/presubmit-cr-x86_64.cfg delete mode 100644 ci/kokoro/push-to-github.cfg delete mode 100755 ci/kokoro/simulate.py delete mode 100644 ci/kokoro/windows/common.cfg delete mode 100644 ci/kokoro/windows/continuous-windows.cfg delete mode 100644 ci/kokoro/windows/crosvm_build.bat delete mode 100644 ci/kokoro/windows/presubmit-windows.cfg delete mode 100644 navbar.md delete mode 100755 run_tests delete mode 100755 setup_cros_cargo.sh delete mode 100755 test_all delete mode 100644 unblocked_terms.txt diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml deleted file mode 100644 index f610126f15..0000000000 --- a/.github/workflows/gh-pages.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: github pages - -on: - push: - branches: - - main - pull_request: - -jobs: - deploy: - runs-on: ubuntu-20.04 - concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - steps: - - uses: actions/checkout@v2 - - - name: Setup mdBook - uses: peaceiris/actions-mdbook@v1 - with: - mdbook-version: 'latest' - - name: Install Dependencies - run: | - sudo apt update - ./tools/install-docs-deps - - name: Run mdbook - run: | - mkdir -p docs/target/ - mdbook build docs/book/ --dest-dir ../target/ - - name: Run cargo doc - run: | - git submodule update --init - ./tools/cargo-doc --target-dir ./docs/target/html/ - - name: Deploy - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./docs/target/html/ diff --git a/PRESUBMIT.cfg b/PRESUBMIT.cfg index 00710e2152..3825f32bee 100644 --- a/PRESUBMIT.cfg +++ b/PRESUBMIT.cfg @@ -2,8 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Per-project `repo upload` hook settings. -# https://chromium.googlesource.com/chromiumos/repohooks/ - +# Configures a warning when using `repo upload` from the ChromeOS or AOSP checkout of crosvm. [Hook Scripts] repo_upload_warning = ./tools/chromeos/repo_upload_warning diff --git a/bin/clippy b/bin/clippy deleted file mode 100755 index ba6d7530d9..0000000000 --- a/bin/clippy +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -echo "./bin/clippy is deprecated. Please use: ./tools/clippy" diff --git a/bin/fmt b/bin/fmt deleted file mode 100755 index 0be0d73d3f..0000000000 --- a/bin/fmt +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -echo "./bin/fmt is deprecated. Please use: ./tools/fmt" diff --git a/ci/kokoro/build-aarch64.sh b/ci/kokoro/build-aarch64.sh deleted file mode 100755 index ffe17bfae6..0000000000 --- a/ci/kokoro/build-aarch64.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source "$(dirname $0)/common.sh" - -./tools/dev_container --hermetic ./tools/run_tests --target=vm:aarch64 -v diff --git a/ci/kokoro/build-armhf.sh b/ci/kokoro/build-armhf.sh deleted file mode 100755 index cc35d9fec3..0000000000 --- a/ci/kokoro/build-armhf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source "$(dirname $0)/common.sh" - -./tools/dev_container --hermetic ./tools/run_tests --target=vm:aarch64 --build-target armhf -v diff --git a/ci/kokoro/build-chromeos.sh b/ci/kokoro/build-chromeos.sh deleted file mode 100755 index d78f30d0a7..0000000000 --- a/ci/kokoro/build-chromeos.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Note: To simulate this locally, sudo needs to be passwordless for the duration of the build (~1h). -# This could be achieved by refreshing sudo in the background before running ci/simulate.py: -# -# while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & -# ./ci/kokoro/simulate.py ./ci/kokoro/build-chromeos.sh - -set -ex - -source "$(dirname $0)/common.sh" - -CROS_ROOT="${KOKORO_ARTIFACTS_DIR}/cros" -CROSVM_ROOT="${KOKORO_ARTIFACTS_DIR}/git/crosvm" -DEPOT_TOOLS="${KOKORO_ARTIFACTS_DIR}/depot_tools" - -BOARD="amd64-generic" -# TODO: Add other packages tracking the crosvm repo. -PACKAGE_LIST=( - 'chromeos-base/crosvm' -) - -# Python script to check for at least version 3.9 -VERSION_CHECK=" -import sys -sys.exit(sys.version_info.major != 3 or sys.version_info.minor < 9) -" - -setup_depot_tools() { - git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git \ - "$DEPOT_TOOLS" - export PATH="${DEPOT_TOOLS}:${PATH}" -} - -setup_cros_source() { - repo init -q -u https://chromium.googlesource.com/chromiumos/manifest \ - -b stable --depth=1 -c -g minilayout,crosvm - time repo sync -c # ~5min - time cros_sdk --create # ~16min -} - -setup_crosvm_source() { - # Pull kokoro's version of crosvm into the cros monorepo - ( - cd "${CROS_ROOT}/src/platform/crosvm" && - git remote add crosvm "$CROSVM_ROOT" && - git fetch crosvm && - git checkout FETCH_HEAD - ) - # Uprev ebuild files - local colon_separated_packages="$(printf '%s:' "${PACKAGE_LIST[@]}")" - ./chromite/scripts/cros_uprev \ - --package="$colon_separated_packages" \ - --overlay-type=public -} - -build_and_test_crosvm() { - # TODO: We currently build crosvm twice. Once with build_packages, once to run tests. - # ~20min - time cros_sdk build_packages --board "$BOARD" implicit-system "${PACKAGE_LIST[@]}" - # ~6min - time cros_sdk cros_run_unit_tests --board "$BOARD" --packages "${PACKAGE_LIST[@]}" -} - -cleanup_cros() { - # Delete cros repo to prevent it from being treated as a build artifact by Kokoro. - cros_sdk --delete || true - sudo rm -rf "${CROS_ROOT}" || true - # Call original cleanup function from common.sh - cleanup -} -trap cleanup_cros EXIT - -main() { - mkdir -p "$CROS_ROOT" - cd "$CROS_ROOT" - - setup_depot_tools - setup_cros_source - setup_crosvm_source - build_and_test_crosvm -} - -main diff --git a/ci/kokoro/build-merge-into-chromeos.sh b/ci/kokoro/build-merge-into-chromeos.sh deleted file mode 100755 index 0725b77ccc..0000000000 --- a/ci/kokoro/build-merge-into-chromeos.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -set -e - -# Python script to check for at least version 3.9 -VERSION_CHECK=" -import sys -sys.exit(sys.version_info.major != 3 or sys.version_info.minor < 9) -" - -main() { - cd "${KOKORO_ARTIFACTS_DIR}/git/crosvm" - - # Ensure we have at least python 3.9. Kokoro does not and requires us to use pyenv to install - # The required version. - if ! python3 -c "$VERSION_CHECK"; then - pyenv install --verbose --skip-existing 3.9.5 - pyenv global 3.9.5 - fi - - # Extra packages required by merge_bot - if ! pip show argh; then - pip install argh - fi - - # Run git cookie auth daemon to pull git http cookies for this GCE instance. - # Don't do this if a cookie already exists, which allow us to test this script locally. - if ! git config http.cookiefile; then - local gcompute_path="${KOKORO_ARTIFACTS_DIR}/gcompute-tools" - git clone "https://gerrit.googlesource.com/gcompute-tools" "$gcompute_path" - ${gcompute_path}/git-cookie-authdaemon - fi - - # Overwrite kokoro default with service account we are actually using to submit code. - git config user.name "Crosvm Bot" - git config user.email "crosvm-bot@crosvm-packages.iam.gserviceaccount.com" - - local target_rev=$(git rev-parse HEAD) - ./tools/chromeos/merge_bot -v update-merges --is-bot "$target_rev" - ./tools/chromeos/merge_bot -v update-dry-runs --is-bot "$target_rev" -} - -main diff --git a/ci/kokoro/build-push-to-github.sh b/ci/kokoro/build-push-to-github.sh deleted file mode 100755 index 29a136e905..0000000000 --- a/ci/kokoro/build-push-to-github.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -GITHUB_TOKEN_FILE=$KOKORO_KEYSTORE_DIR/76320_github_token -TOKEN=$(cat $GITHUB_TOKEN_FILE) - -cd "${KOKORO_ARTIFACTS_DIR}/git/crosvm" -git push --force --all "https://crosvm-bot:${TOKEN}@github.com/google/crosvm.git" diff --git a/ci/kokoro/build-x86_64-direct.sh b/ci/kokoro/build-x86_64-direct.sh deleted file mode 100755 index f6414f527f..0000000000 --- a/ci/kokoro/build-x86_64-direct.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source "$(dirname $0)/common.sh" - -./tools/dev_container --hermetic ./tools/run_tests --target=host \ - --crosvm-direct -v diff --git a/ci/kokoro/build-x86_64.sh b/ci/kokoro/build-x86_64.sh deleted file mode 100755 index b13e4a7830..0000000000 --- a/ci/kokoro/build-x86_64.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source "$(dirname $0)/common.sh" - -./tools/dev_container --self-test - -./tools/dev_container --hermetic bash -c "\ - ./tools/run_tests --target=host -v \ - && ./tools/health-check \ - && cargo build --verbose --no-default-features \ - && mdbook build ./docs/book \ - && ./tools/cargo-doc" diff --git a/ci/kokoro/common.cfg b/ci/kokoro/common.cfg deleted file mode 100644 index af580cb7b1..0000000000 --- a/ci/kokoro/common.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -timeout_mins: 20 - -action { - define_artifacts { - regex: "logs/**/*" - } -} diff --git a/ci/kokoro/common.sh b/ci/kokoro/common.sh deleted file mode 100755 index 2c4bf7d588..0000000000 --- a/ci/kokoro/common.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Enable SSH access to the kokoro builder. -# Use the fusion2/ UI to trigger a build and set the DEBUG_SSH_KEY environment -# variable to your public key, that will allow you to connect to the builder -# via SSH. -# Note: Access is restricted to the google corporate network. -# Details: https://yaqs.corp.google.com/eng/q/6628551334035456 -if [[ ! -z "${DEBUG_SSH_KEY}" ]]; then - echo "${DEBUG_SSH_KEY}" >>~/.ssh/authorized_keys - external_ip=$( - curl -s -H "Metadata-Flavor: Google" \ - http://metadata/computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip - ) - echo "SSH Debug enabled. Connect to: kbuilder@${external_ip}" -fi - -setup_source() { - if [ ! -d "${KOKORO_ARTIFACTS_DIR}" ]; then - echo "This script must be run in kokoro" - exit 1 - fi - - mkdir -p "${KOKORO_ARTIFACTS_DIR}/logs" - - cd "${KOKORO_ARTIFACTS_DIR}/git/crosvm" - - # The Kokoro builder has not the required packages from ./tools/install-deps and an old python - # version. - # Install what is needed to run ./tools/dev_container - # Note: This won't be necessary once we switch to a custom Kokoro image (or luci) - if command -v pyenv; then - pyenv install -v 3.9.5 - pyenv global 3.9.5 - pip install argh - fi - - echo "Rebasing changes to ToT" - # We cannot use the original origin that kokoro used, as we no longer have - # access the GoB host via rpc://. - git remote remove origin - git remote add origin https://chromium.googlesource.com/chromiumos/platform/crosvm - git fetch -q origin - - # For some mysterious reason symlinks show up as modified, which prevents - # us from rebasing the changes. - git checkout -f - git rebase origin/main - if [ $? -ne 0 ]; then - return 1 - fi - - echo "Fetching Submodules..." - git submodule update --init -} - -cleanup() { - # Sleep after the build to allow for SSH debugging to continue. - if [[ ! -z "${DEBUG_SSH_KEY}" ]]; then - echo "Build done. Blocking for SSH debugging." - sleep 1h - fi - - # List files in the logs directory which are uploaded to sponge. - echo "Build Artifacts:" - ls "${KOKORO_ARTIFACTS_DIR}/logs" -} - -# Setup source when the script is loaded. Clean up on exit. -trap cleanup EXIT -setup_source || { - echo "Failed to setup_source" - exit 1 -} - -# Set logs directory so we can copy them to sponge -export CROSVM_BUILDER_LOGS_DIR="${KOKORO_ARTIFACTS_DIR}/logs" -cd "${KOKORO_ARTIFACTS_DIR}/git/crosvm" diff --git a/ci/kokoro/continuous-aarch64.cfg b/ci/kokoro/continuous-aarch64.cfg deleted file mode 100644 index f917d9011a..0000000000 --- a/ci/kokoro/continuous-aarch64.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-aarch64.sh" diff --git a/ci/kokoro/continuous-armhf.cfg b/ci/kokoro/continuous-armhf.cfg deleted file mode 100644 index a628238e8e..0000000000 --- a/ci/kokoro/continuous-armhf.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-armhf.sh" diff --git a/ci/kokoro/continuous-chromeos.cfg b/ci/kokoro/continuous-chromeos.cfg deleted file mode 100644 index 6028dc22c2..0000000000 --- a/ci/kokoro/continuous-chromeos.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-chromeos.sh" - -# ChromeOS builds have a longer timeout: 4h -timeout_mins: 240 diff --git a/ci/kokoro/continuous-x86_64-direct.cfg b/ci/kokoro/continuous-x86_64-direct.cfg deleted file mode 100644 index 0e18c71119..0000000000 --- a/ci/kokoro/continuous-x86_64-direct.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-x86_64-direct.sh" diff --git a/ci/kokoro/continuous-x86_64.cfg b/ci/kokoro/continuous-x86_64.cfg deleted file mode 100644 index ed9a3e73c6..0000000000 --- a/ci/kokoro/continuous-x86_64.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-x86_64.sh" diff --git a/ci/kokoro/merge-into-chromeos.cfg b/ci/kokoro/merge-into-chromeos.cfg deleted file mode 100644 index bb5b1416f9..0000000000 --- a/ci/kokoro/merge-into-chromeos.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-merge-into-chromeos.sh" diff --git a/ci/kokoro/presubmit-cq-aarch64.cfg b/ci/kokoro/presubmit-cq-aarch64.cfg deleted file mode 100644 index f917d9011a..0000000000 --- a/ci/kokoro/presubmit-cq-aarch64.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-aarch64.sh" diff --git a/ci/kokoro/presubmit-cq-armhf.cfg b/ci/kokoro/presubmit-cq-armhf.cfg deleted file mode 100644 index a628238e8e..0000000000 --- a/ci/kokoro/presubmit-cq-armhf.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-armhf.sh" diff --git a/ci/kokoro/presubmit-cq-x86_64-direct.cfg b/ci/kokoro/presubmit-cq-x86_64-direct.cfg deleted file mode 100644 index 0e18c71119..0000000000 --- a/ci/kokoro/presubmit-cq-x86_64-direct.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-x86_64-direct.sh" diff --git a/ci/kokoro/presubmit-cq-x86_64.cfg b/ci/kokoro/presubmit-cq-x86_64.cfg deleted file mode 100644 index ed9a3e73c6..0000000000 --- a/ci/kokoro/presubmit-cq-x86_64.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-x86_64.sh" diff --git a/ci/kokoro/presubmit-cr-aarch64.cfg b/ci/kokoro/presubmit-cr-aarch64.cfg deleted file mode 100644 index f917d9011a..0000000000 --- a/ci/kokoro/presubmit-cr-aarch64.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-aarch64.sh" diff --git a/ci/kokoro/presubmit-cr-armhf.cfg b/ci/kokoro/presubmit-cr-armhf.cfg deleted file mode 100644 index a628238e8e..0000000000 --- a/ci/kokoro/presubmit-cr-armhf.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-armhf.sh" diff --git a/ci/kokoro/presubmit-cr-x86_64-direct.cfg b/ci/kokoro/presubmit-cr-x86_64-direct.cfg deleted file mode 100644 index 0e18c71119..0000000000 --- a/ci/kokoro/presubmit-cr-x86_64-direct.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-x86_64-direct.sh" diff --git a/ci/kokoro/presubmit-cr-x86_64.cfg b/ci/kokoro/presubmit-cr-x86_64.cfg deleted file mode 100644 index ed9a3e73c6..0000000000 --- a/ci/kokoro/presubmit-cr-x86_64.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-x86_64.sh" diff --git a/ci/kokoro/push-to-github.cfg b/ci/kokoro/push-to-github.cfg deleted file mode 100644 index 2ab07995dc..0000000000 --- a/ci/kokoro/push-to-github.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/build-push-to-github.sh" - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 76320 - keyname: "github_token" - backend: "blade:keystore-fastconfigpush" - } - } -} diff --git a/ci/kokoro/simulate.py b/ci/kokoro/simulate.py deleted file mode 100755 index beaaaab092..0000000000 --- a/ci/kokoro/simulate.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python3 -# Copyright 2022 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -from pathlib import Path -import argparse -import os -import subprocess -import tempfile - -USAGE = """ -Simulates a Kokoro run executing one of the build-* scripts. - -Example: - $ cd ./ci/kokoro - $ ./simulate.py build-aarch64.sh -""" - -CROSVM_ROOT = Path(__file__).parent.parent.parent.resolve() - - -def git_clone_source(source: Path, destination: Path): - destination.mkdir(parents=True, exist_ok=True) - print(f"Cloning {source} into {destination}:") - subprocess.check_call(["git", "clone", "-q", source, destination]) - - -def run_kokoro_build_script(kokoro_root: Path, script_path: Path): - print(f"Running {script_path}:") - env = os.environ.copy() - env["KOKORO_ARTIFACTS_DIR"] = str(kokoro_root / "src") - subprocess.check_call([script_path.resolve()], cwd=kokoro_root, env=env) - - -def simulate_kokoro(kokoro_root: Path, script_path: Path): - git_clone_source(CROSVM_ROOT, kokoro_root / "src/git/crosvm") - run_kokoro_build_script(kokoro_root, script_path) - - -def main(): - parser = argparse.ArgumentParser(usage=USAGE) - parser.add_argument("script_name", type=Path) - args = parser.parse_args() - - script_path: Path = args.script_name - if not script_path.exists(): - raise ValueError(f"Script '{script_path} not found.") - - with tempfile.TemporaryDirectory() as temp_dir: - simulate_kokoro(Path(temp_dir), script_path) - - -if __name__ == "__main__": - main() diff --git a/ci/kokoro/windows/common.cfg b/ci/kokoro/windows/common.cfg deleted file mode 100644 index 8749e89fc7..0000000000 --- a/ci/kokoro/windows/common.cfg +++ /dev/null @@ -1,9 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -timeout_mins: 40 - -action { - define_artifacts { - regex: "logs/**/*" - } -} diff --git a/ci/kokoro/windows/continuous-windows.cfg b/ci/kokoro/windows/continuous-windows.cfg deleted file mode 100644 index 9605de89ab..0000000000 --- a/ci/kokoro/windows/continuous-windows.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/windows/crosvm_build.bat" diff --git a/ci/kokoro/windows/crosvm_build.bat b/ci/kokoro/windows/crosvm_build.bat deleted file mode 100644 index 835329f794..0000000000 --- a/ci/kokoro/windows/crosvm_build.bat +++ /dev/null @@ -1,53 +0,0 @@ -:: Copyright 2022 The ChromiumOS Authors -:: Use of this source code is governed by a BSD-style license that can be -:: found in the LICENSE file. - -:: Make environment changes (cd, env vars, etc.) local, so they don't affect the calling batch file -setlocal - -:: Code under repo is checked out to %KOKORO_ARTIFACTS_DIR%\git. -:: The final directory name in this path is determined by the scm name specified -:: in the job configuration -cd %KOKORO_ARTIFACTS_DIR%\git\crosvm - -:: Pin rustup to a known/tested version. -set rustup_version=1.24.3 - -:: Install rust toolchain through rustup. -echo [%TIME%] installing rustup %rustup_version% -choco install --no-progress -y rustup.install --version=%rustup_version% --ignore-checksums - -:: Reload path for installed rustup binary -call RefreshEnv.cmd - -:: Toolchain version and necessary components will be automatically picked -:: up from rust-toolchain -cargo install bindgen - -:: Install python. The default kokoro intalled version is 3.7 but linux tests -:: seem to run on 3.9+. -choco install --no-progress -y python --version=3.9.0 - -:: Reload path for installed rust toolchain. -call RefreshEnv.cmd - -:: Log the version of the Rust toolchain -echo [%TIME%] Using Rust toolchain version: -cargo --version -rustc --version - -:: Log python version -echo [%TIME%] Python version: -py --version - -py -m pip install argh --user - -echo [%TIME%] Calling crosvm\tools\clippy -py .\tools\clippy -if %ERRORLEVEL% neq 0 ( exit /b %ERRORLEVEL% ) - -echo [%TIME%] Calling crosvm\tools\run_tests -py .\tools\run_tests --build-target=x86_64-pc-windows-msvc -v -if %ERRORLEVEL% neq 0 ( exit /b %ERRORLEVEL% ) - -exit /b %ERRORLEVEL% diff --git a/ci/kokoro/windows/presubmit-windows.cfg b/ci/kokoro/windows/presubmit-windows.cfg deleted file mode 100644 index 9605de89ab..0000000000 --- a/ci/kokoro/windows/presubmit-windows.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "crosvm/ci/kokoro/windows/crosvm_build.bat" diff --git a/navbar.md b/navbar.md deleted file mode 100644 index 5a1c05012d..0000000000 --- a/navbar.md +++ /dev/null @@ -1,6 +0,0 @@ -# crosvm - -- [Home](/README.md) -- [Contribution guide](/CONTRIBUTING.md) -- [Architecture](/ARCHITECTURE.md) -- [Book of crosvm](https://crosvm.dev/book/) diff --git a/run_tests b/run_tests deleted file mode 100755 index 31fab066b5..0000000000 --- a/run_tests +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -echo "./run_tests is deprecated. Please run ./tools/run_tests" diff --git a/setup_cros_cargo.sh b/setup_cros_cargo.sh deleted file mode 100755 index 361e48b025..0000000000 --- a/setup_cros_cargo.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -echo "./setup_cros_cargo.sh is deprecated. " \ - "Please use: ./tools/chromeos/setup_cargo" diff --git a/test_all b/test_all deleted file mode 100755 index d0b7d153ee..0000000000 --- a/test_all +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# Copyright 2021 The ChromiumOS Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -echo "./test_all is deprecated. Please run ./tools/presubmit --quick" diff --git a/unblocked_terms.txt b/unblocked_terms.txt deleted file mode 100644 index 69af134388..0000000000 --- a/unblocked_terms.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Don't delete this file if you want to keep keyword_check enabled even if it's -# empty. -# -# See repohooks/README.md for more details. - -dummy -master -\bnative -slave -white.?list