diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-04-03 08:36:07 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-04-03 11:23:36 +0300 |
| commit | 4eec76845b4d5aee321d6ffc6c2dbd0fdc8fc50a (patch) | |
| tree | 085c350e2464fcf489a375f3b50c461598e681c3 | |
| parent | 1c145744d63b09635c6064c81e00d779dd57a26d (diff) | |
ci: Remove testing with bad proxies
One of our CI jobs is testing that Gitaly works correctly when invalid
proxies have been configured. This test only checks the `rubyserver`
package though, which is about to be removed. The tests are thus not
required anymore.
Remove the CI jobs and the infrastructure supporting it.
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | _support/bad-proxies | 6 |
3 files changed, 2 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d503fe8e4..5576613fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,7 @@ test: # using bundled Git binaries. - GO_VERSION: [ "1.18", "1.19" ] TEST_TARGET: test - - TEST_TARGET: [ test-with-proxies, test-with-praefect, race-go ] + - TEST_TARGET: [ test-with-praefect, race-go ] # We also verify that things work as expected with a non-bundled Git # version matching our minimum required Git version. - TEST_TARGET: test @@ -279,7 +279,7 @@ test:nightly: parallel: matrix: - GIT_VERSION: [ "master", "next" ] - TEST_TARGET: [ test, test-with-proxies, test-with-praefect ] + TEST_TARGET: [ test, test-with-praefect ] rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' - when: manual @@ -380,12 +380,6 @@ bench: override TEST_OPTIONS := ${TEST_OPTIONS} -bench=. -run=^$ bench: ${BENCHMARK_REPO} prepare-tests ${Q}$(call run_go_tests) -.PHONY: test-with-proxies -test-with-proxies: override TEST_OPTIONS := ${TEST_OPTIONS} -exec ${SOURCE_DIR}/_support/bad-proxies -test-with-proxies: TEST_PACKAGES := ${GITALY_PACKAGE}/internal/gitaly/rubyserver -test-with-proxies: prepare-tests - ${Q}$(call run_go_tests) - .PHONY: test-with-praefect ## Run Go tests with Praefect. test-with-praefect: prepare-tests diff --git a/_support/bad-proxies b/_support/bad-proxies deleted file mode 100755 index fceca168d..000000000 --- a/_support/bad-proxies +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -export http_proxy=http://invalid -export https_proxy=https://invalid - -exec "$@" |