From 930910924331ecdefd24083e84d4a17f896552d4 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Fri, 12 Feb 2021 14:46:07 -0400 Subject: [PATCH] Only pin the few jobs that seem to need 18.04 Signed-off-by: Jesse Szwedko --- .github/workflows/benches.yml | 4 ++-- .github/workflows/environment.yml | 2 +- .github/workflows/install-sh.yml | 6 +++--- .github/workflows/integration-test.yml | 2 +- .github/workflows/k8s_e2e.yml | 6 +++--- .github/workflows/nightly.yml | 20 ++++++++++---------- .github/workflows/release.yml | 26 +++++++++++++------------- .github/workflows/test-harness.yml | 2 +- .github/workflows/test.yml | 4 ++-- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/benches.yml b/.github/workflows/benches.yml index 4625df0c6bd0f4..e4f23883da50e4 100644 --- a/.github/workflows/benches.yml +++ b/.github/workflows/benches.yml @@ -28,7 +28,7 @@ env: jobs: cancel-previous: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 3 if: github.ref != 'refs/heads/master' steps: @@ -103,7 +103,7 @@ jobs: needs: - cancel-previous - bench - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Discord notification env: diff --git a/.github/workflows/environment.yml b/.github/workflows/environment.yml index 01c9a10d3e62ea..b01de4c2741889 100644 --- a/.github/workflows/environment.yml +++ b/.github/workflows/environment.yml @@ -11,7 +11,7 @@ env: jobs: publish-new-environment: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/install-sh.yml b/.github/workflows/install-sh.yml index 438bf6a2ad365d..18df108438f219 100644 --- a/.github/workflows/install-sh.yml +++ b/.github/workflows/install-sh.yml @@ -12,7 +12,7 @@ on: jobs: sync-install: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: sudo apt-get install --yes python3-setuptools python3.6-dev @@ -25,7 +25,7 @@ jobs: test-install: needs: - sync-install - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - run: sudo apt-get install --yes curl bc - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.vector.dev | bash -s -- -y @@ -37,7 +37,7 @@ jobs: needs: - sync-install - test-install - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Discord notification env: diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 819a042b5e75bf..437130a3735c26 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -329,7 +329,7 @@ jobs: - test-integration-loki - test-integration-pulsar - test-integration-splunk - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Discord notification env: diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml index dc8fa4314951ab..167889dffca5af 100644 --- a/.github/workflows/k8s_e2e.yml +++ b/.github/workflows/k8s_e2e.yml @@ -80,7 +80,7 @@ jobs: # See https://github.community/t/feature-request-and-use-case-example-to-allow-matrix-in-if-s/126067 compute-k8s-test-plan: name: Compute K8s test plan - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} if: | @@ -135,7 +135,7 @@ jobs: test-e2e-kubernetes: name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }}) - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: - build-x86_64-unknown-linux-gnu - compute-k8s-test-plan @@ -169,7 +169,7 @@ jobs: - build-x86_64-unknown-linux-gnu - compute-k8s-test-plan - test-e2e-kubernetes - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Discord notification env: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 79c0fb3e5bb6de..9173cde9867d99 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -14,7 +14,7 @@ env: jobs: build-x86_64-unknown-linux-musl-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV @@ -28,7 +28,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl.tar.gz" build-x86_64-unknown-linux-gnu-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -50,7 +50,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm" build-aarch64-unknown-linux-musl-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -73,7 +73,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.aarch64.rpm" build-aarch64-unknown-linux-gnu-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -88,7 +88,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu.tar.gz" build-armv7-unknown-linux-gnueabihf-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -110,7 +110,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.armv7.rpm" build-armv7-unknown-linux-musleabihf-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV @@ -212,7 +212,7 @@ jobs: deb-verify: needs: - build-x86_64-unknown-linux-gnu-packages - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: container: ["ubuntu:14.04","ubuntu:16.04","ubuntu:18.04","ubuntu:20.04","debian:8","debian:9","debian:10"] @@ -244,7 +244,7 @@ jobs: rpm-verify: needs: - build-x86_64-unknown-linux-gnu-packages - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: container: ["centos:7","centos:8","amazonlinux:1","amazonlinux:2","fedora:33"] @@ -428,7 +428,7 @@ jobs: run: make release-s3 release-cloudsmith: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: - build-x86_64-unknown-linux-gnu-packages - build-aarch64-unknown-linux-musl-packages @@ -576,7 +576,7 @@ jobs: - deb-verify - rpm-verify - osx-verify - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Discord notification env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d2c66d8bc7e87..d534e74c03572a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ env: jobs: build-x86_64-unknown-linux-musl-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV @@ -29,7 +29,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl.tar.gz" build-x86_64-unknown-linux-gnu-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -51,7 +51,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm" build-aarch64-unknown-linux-musl-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -74,7 +74,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.aarch64.rpm" build-aarch64-unknown-linux-gnu-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -89,7 +89,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu.tar.gz" build-armv7-unknown-linux-gnueabihf-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: make ci-sweep @@ -111,7 +111,7 @@ jobs: path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.armv7.rpm" build-armv7-unknown-linux-musleabihf-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v1 - run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV @@ -213,7 +213,7 @@ jobs: deb-verify: needs: - build-x86_64-unknown-linux-gnu-packages - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: container: ["ubuntu:14.04","ubuntu:16.04","ubuntu:18.04","ubuntu:20.04","debian:8","debian:9","debian:10"] @@ -245,7 +245,7 @@ jobs: rpm-verify: needs: - build-x86_64-unknown-linux-gnu-packages - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: container: ["centos:7","centos:8","amazonlinux:1","amazonlinux:2","fedora:33"] @@ -291,7 +291,7 @@ jobs: tar -xvf target/artifacts/vector-${{ env.VECTOR_VERSION }}-x86_64-apple-darwin.tar.gz && vector-x86_64-apple-darwin/bin/vector --version release-docker: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: - build-aarch64-unknown-linux-musl-packages - build-x86_64-unknown-linux-gnu-packages @@ -347,7 +347,7 @@ jobs: make release-docker release-s3: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: - build-x86_64-unknown-linux-gnu-packages - build-x86_64-unknown-linux-musl-packages @@ -530,7 +530,7 @@ jobs: make release-homebrew release-cloudsmith: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: - build-x86_64-unknown-linux-gnu-packages - build-aarch64-unknown-linux-musl-packages @@ -644,7 +644,7 @@ jobs: file: "target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.armv7.rpm" release-helm: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: # This is not strictly required, but ensures that Helm Chart doesn't # appear before the image it refers to. @@ -679,7 +679,7 @@ jobs: - release-cloudsmith - release-github - release-helm - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Discord notification env: diff --git a/.github/workflows/test-harness.yml b/.github/workflows/test-harness.yml index b7d7d71a63a5a2..a60b82d488d5c6 100644 --- a/.github/workflows/test-harness.yml +++ b/.github/workflows/test-harness.yml @@ -6,7 +6,7 @@ on: jobs: test-harness: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 needs: version diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d510245128a79..08159a28eecc97 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: access_token: ${{ secrets.GITHUB_TOKEN }} changes: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 # Set job outputs to values from filter step outputs: source: ${{ steps.filter.outputs.source }} @@ -287,7 +287,7 @@ jobs: - test-windows - check-component-features - checks - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Discord notification env: