From fbe738ed8a4042042441d17da1dfdd25a9132645 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Wed, 1 Feb 2023 13:17:53 -0800 Subject: [PATCH] Delete Kokoro Linux CMake and Composer tests in favor of GHA. These have already been migrated, this just deleted dead code PiperOrigin-RevId: 506404488 --- kokoro/linux/cmake/build.sh | 35 --------------------- kokoro/linux/cmake/common.cfg | 11 ------- kokoro/linux/cmake/continuous.cfg | 1 - kokoro/linux/cmake/presubmit.cfg | 1 - kokoro/linux/cmake_install/build.sh | 37 ----------------------- kokoro/linux/cmake_install/common.cfg | 11 ------- kokoro/linux/cmake_install/continuous.cfg | 1 - kokoro/linux/cmake_install/presubmit.cfg | 1 - kokoro/linux/cmake_ninja/build.sh | 32 -------------------- kokoro/linux/cmake_ninja/common.cfg | 11 ------- kokoro/linux/cmake_ninja/continuous.cfg | 1 - kokoro/linux/cmake_ninja/presubmit.cfg | 1 - kokoro/linux/cmake_shared/build.sh | 35 --------------------- kokoro/linux/cmake_shared/common.cfg | 11 ------- kokoro/linux/cmake_shared/continuous.cfg | 1 - kokoro/linux/cmake_shared/presubmit.cfg | 1 - kokoro/linux/php_all/build.sh | 25 --------------- kokoro/linux/php_all/common.cfg | 11 ------- kokoro/linux/php_all/continuous.cfg | 1 - kokoro/linux/php_all/presubmit.cfg | 1 - 20 files changed, 229 deletions(-) delete mode 100755 kokoro/linux/cmake/build.sh delete mode 100644 kokoro/linux/cmake/common.cfg delete mode 100644 kokoro/linux/cmake/continuous.cfg delete mode 100644 kokoro/linux/cmake/presubmit.cfg delete mode 100755 kokoro/linux/cmake_install/build.sh delete mode 100644 kokoro/linux/cmake_install/common.cfg delete mode 100644 kokoro/linux/cmake_install/continuous.cfg delete mode 100644 kokoro/linux/cmake_install/presubmit.cfg delete mode 100755 kokoro/linux/cmake_ninja/build.sh delete mode 100644 kokoro/linux/cmake_ninja/common.cfg delete mode 100644 kokoro/linux/cmake_ninja/continuous.cfg delete mode 100644 kokoro/linux/cmake_ninja/presubmit.cfg delete mode 100755 kokoro/linux/cmake_shared/build.sh delete mode 100644 kokoro/linux/cmake_shared/common.cfg delete mode 100644 kokoro/linux/cmake_shared/continuous.cfg delete mode 100644 kokoro/linux/cmake_shared/presubmit.cfg delete mode 100755 kokoro/linux/php_all/build.sh delete mode 100644 kokoro/linux/php_all/common.cfg delete mode 100644 kokoro/linux/php_all/continuous.cfg delete mode 100644 kokoro/linux/php_all/presubmit.cfg diff --git a/kokoro/linux/cmake/build.sh b/kokoro/linux/cmake/build.sh deleted file mode 100755 index e058add986..0000000000 --- a/kokoro/linux/cmake/build.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests using CMake - -set -eux - -# Change to repo root -cd $(dirname $0)/../../.. -GIT_REPO_ROOT=`pwd` - -CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 - -# Update git submodules and regenerate files -git submodule update --init --recursive -use_bazel.sh 5.1.1 -sudo ./kokoro/common/setup_kokoro_environment.sh -./regenerate_stale_files.sh - -tmpfile=$(mktemp -u) - -gcloud components update --quiet -gcloud auth configure-docker us-docker.pkg.dev --quiet - -docker run \ - --cidfile $tmpfile \ - -v $GIT_REPO_ROOT:/workspace \ - $CONTAINER_IMAGE \ - /test.sh \ - -Dprotobuf_BUILD_CONFORMANCE=ON \ - -Dprotobuf_BUILD_EXAMPLES=ON \ - -DCMAKE_CXX_STANDARD=14 - -# Save logs for Kokoro -docker cp \ - `cat $tmpfile`:/workspace/logs $KOKORO_ARTIFACTS_DIR diff --git a/kokoro/linux/cmake/common.cfg b/kokoro/linux/cmake/common.cfg deleted file mode 100644 index f03bd3945f..0000000000 --- a/kokoro/linux/cmake/common.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} diff --git a/kokoro/linux/cmake/continuous.cfg b/kokoro/linux/cmake/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake/presubmit.cfg b/kokoro/linux/cmake/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_install/build.sh b/kokoro/linux/cmake_install/build.sh deleted file mode 100755 index ea74c715da..0000000000 --- a/kokoro/linux/cmake_install/build.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Build file to build, install, and test using CMake. - -set -eux - -# Change to repo root -cd $(dirname $0)/../../.. -GIT_REPO_ROOT=`pwd` - -CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 - -# Update git submodules and regenerate files -git submodule update --init --recursive -use_bazel.sh 5.1.1 -sudo ./kokoro/common/setup_kokoro_environment.sh -./regenerate_stale_files.sh - -tmpfile=$(mktemp -u) - -gcloud components update --quiet -gcloud auth configure-docker us-docker.pkg.dev --quiet - -docker run \ - --cidfile $tmpfile \ - -v $GIT_REPO_ROOT:/workspace \ - $CONTAINER_IMAGE \ - "/install.sh -DCMAKE_CXX_STANDARD=14 && /test.sh \ - -Dprotobuf_REMOVE_INSTALLED_HEADERS=ON \ - -Dprotobuf_BUILD_PROTOBUF_BINARIES=OFF \ - -Dprotobuf_BUILD_CONFORMANCE=ON \ - -DCMAKE_CXX_STANDARD=14" - - -# Save logs for Kokoro -docker cp \ - `cat $tmpfile`:/workspace/logs $KOKORO_ARTIFACTS_DIR diff --git a/kokoro/linux/cmake_install/common.cfg b/kokoro/linux/cmake_install/common.cfg deleted file mode 100644 index f1ae0b351f..0000000000 --- a/kokoro/linux/cmake_install/common.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake_install/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} diff --git a/kokoro/linux/cmake_install/continuous.cfg b/kokoro/linux/cmake_install/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake_install/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_install/presubmit.cfg b/kokoro/linux/cmake_install/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake_install/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_ninja/build.sh b/kokoro/linux/cmake_ninja/build.sh deleted file mode 100755 index 1bb2c5a11f..0000000000 --- a/kokoro/linux/cmake_ninja/build.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests using CMake with the Ninja generator. - -set -eux - -# Change to repo root -cd $(dirname $0)/../../.. -GIT_REPO_ROOT=`pwd` - -CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 - -# Update git submodules and regenerate files -git submodule update --init --recursive -use_bazel.sh 5.1.1 -sudo ./kokoro/common/setup_kokoro_environment.sh -./regenerate_stale_files.sh - -tmpfile=$(mktemp -u) - -gcloud components update --quiet -gcloud auth configure-docker us-docker.pkg.dev --quiet - -docker run \ - --cidfile $tmpfile \ - -v $GIT_REPO_ROOT:/workspace \ - $CONTAINER_IMAGE \ - /test.sh -G Ninja -Dprotobuf_BUILD_CONFORMANCE=ON -DCMAKE_CXX_STANDARD=14 - -# Save logs for Kokoro -docker cp \ - `cat $tmpfile`:/workspace/logs $KOKORO_ARTIFACTS_DIR diff --git a/kokoro/linux/cmake_ninja/common.cfg b/kokoro/linux/cmake_ninja/common.cfg deleted file mode 100644 index 144fc90a82..0000000000 --- a/kokoro/linux/cmake_ninja/common.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake_ninja/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} diff --git a/kokoro/linux/cmake_ninja/continuous.cfg b/kokoro/linux/cmake_ninja/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake_ninja/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_ninja/presubmit.cfg b/kokoro/linux/cmake_ninja/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake_ninja/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_shared/build.sh b/kokoro/linux/cmake_shared/build.sh deleted file mode 100755 index ee4ee8d717..0000000000 --- a/kokoro/linux/cmake_shared/build.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests via CMake using shared libraries - -set -eux - -# Change to repo root -cd $(dirname $0)/../../.. -GIT_REPO_ROOT=`pwd` - -CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 - -# Update git submodules and regenerate files -git submodule update --init --recursive -use_bazel.sh 5.1.1 -sudo ./kokoro/common/setup_kokoro_environment.sh -./regenerate_stale_files.sh - -tmpfile=$(mktemp -u) - -gcloud components update --quiet -gcloud auth configure-docker us-docker.pkg.dev --quiet - -docker run \ - --cidfile $tmpfile \ - -v $GIT_REPO_ROOT:/workspace \ - $CONTAINER_IMAGE \ - /test.sh \ - -Dprotobuf_BUILD_CONFORMANCE=ON \ - -Dprotobuf_BUILD_SHARED_LIBS=ON \ - -DCMAKE_CXX_STANDARD=14 - -# Save logs for Kokoro -docker cp \ - `cat $tmpfile`:/workspace/logs $KOKORO_ARTIFACTS_DIR diff --git a/kokoro/linux/cmake_shared/common.cfg b/kokoro/linux/cmake_shared/common.cfg deleted file mode 100644 index f03bd3945f..0000000000 --- a/kokoro/linux/cmake_shared/common.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} diff --git a/kokoro/linux/cmake_shared/continuous.cfg b/kokoro/linux/cmake_shared/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake_shared/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_shared/presubmit.cfg b/kokoro/linux/cmake_shared/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/cmake_shared/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/php_all/build.sh b/kokoro/linux/php_all/build.sh deleted file mode 100755 index 546359912c..0000000000 --- a/kokoro/linux/php_all/build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# This is the entry point for kicking off a Kokoro job. This path is referenced -# from the .cfg files in this directory. - -set -ex - -# Change to repo base. -cd $(dirname $0)/../../.. - -gcloud components update --quiet -gcloud auth configure-docker us-docker.pkg.dev --quiet - -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test_valgrind" - -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:7.3.28-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:7.4.18-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" - -# Run specialized memory leak & multirequest tests. -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test_c && tests/multirequest.sh && tests/memory_leak_test.sh" - -# Most of our tests use a debug build of PHP, but we do one build against an opt -# php just in case that surfaces anything unexpected. -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" diff --git a/kokoro/linux/php_all/common.cfg b/kokoro/linux/php_all/common.cfg deleted file mode 100644 index dfa8037ef8..0000000000 --- a/kokoro/linux/php_all/common.cfg +++ /dev/null @@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/php_all/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} diff --git a/kokoro/linux/php_all/continuous.cfg b/kokoro/linux/php_all/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/php_all/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/php_all/presubmit.cfg b/kokoro/linux/php_all/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/linux/php_all/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead.