Revert "[CI] Reduce cache download timeout" (open-telemetry#15243)

Revert "[CI] Reduce cache download timeout (open-telemetry#14689)" This reverts commit 7429ab6.
shalper2 · Dec 6, 2022 · 285bf1f · 285bf1f
1 parent 685052e
commit 285bf1f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 50 deletions.
diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml
@@ -33,8 +33,6 @@ jobs:
           path: |
             ~\go\pkg\mod
           key: go-mod-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-mod-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -72,16 +70,12 @@ jobs:
           path: |
             ~\go\pkg\mod
           key: go-mod-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Cache Go Build
         uses: actions/cache@v3
         with:
           path: |
             ~\AppData\Local\go-build
           key: go-build-cache-${{ runner.os }}-${{ matrix.group }}-go-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Run Unit tests
         run: make gotest GROUP=${{ matrix.group }}
   windows-unittest:

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,7 +1,7 @@
 name: build-and-test
 on:
   push:
-    branches: [main]
+    branches: [ main ]
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+*'
   pull_request:
@@ -35,8 +35,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -89,8 +87,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -102,8 +98,6 @@ jobs:
         with:
           path: ~/.cache/go-build
           key: go-lint-build-${{ matrix.group }}-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Lint
         run: make -j2 golint GROUP=${{ matrix.group }}
   lint:
@@ -140,8 +134,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -196,8 +188,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -209,8 +199,6 @@ jobs:
         with:
           path: ~/.cache/go-build
           key: go-test-build-${{ runner.os }}-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Run Unit Tests
         run: make gotest GROUP=${{ matrix.group }}
   unittest:
@@ -251,8 +239,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Run Integration Tests
         run: make integration-tests-with-cover
 
@@ -274,8 +260,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -302,8 +286,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -365,8 +347,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -447,8 +427,6 @@ jobs:
           path: |
             "C:\Program Files (x86)\WiX Toolset v3.11"
           key: wix-3.11
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install Wix Toolset
         if: steps.wix-cache.outputs.cache-hit != 'true'
         run: .\internal\buildscripts\packaging\msi\make.ps1 Install-Tools
@@ -505,8 +483,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -532,14 +508,14 @@ jobs:
       - name: Build Docker Image
         if: steps.check.outputs.passed == 'true'
         run: |
-          make docker-otelcontribcol
-          docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
-          docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:latest
+            make docker-otelcontribcol
+            docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
+            docker tag otelcontribcol:latest otel/opentelemetry-collector-contrib-dev:latest
       - name: Validate Docker Image
         if: steps.check.outputs.passed == 'true'
         run: |
-          docker run otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA --version
-          docker run otel/opentelemetry-collector-contrib-dev:latest --version
+            docker run otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA --version
+            docker run otel/opentelemetry-collector-contrib-dev:latest --version
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -548,8 +524,8 @@ jobs:
       - name: Push Docker Image
         if: steps.check.outputs.passed == 'true'
         run: |
-          docker push otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
-          docker push otel/opentelemetry-collector-contrib-dev:latest
+            docker push otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
+            docker push otel/opentelemetry-collector-contrib-dev:latest
   publish-stable:
     runs-on: ubuntu-latest
     needs: [lint, unittest, integration-tests, build-package]
@@ -572,8 +548,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -42,8 +42,6 @@ jobs:
             ~/go/bin
             ~/go/pkg/mod
           key: changelog-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
 
       - name: Ensure no changes to the CHANGELOG
         run: |

diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml
@@ -38,8 +38,6 @@ jobs:
             ~/go/pkg/mod
             ~/.cache/go-build
           key: loadtest-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install Dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
@@ -72,8 +70,6 @@ jobs:
         with:
           path: /opt/td-agent-bit
           key: fluentbit-cache-1.5.3
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - run: sudo ln -s /opt/td-agent-bit/bin/td-agent-bit /usr/local/bin/fluent-bit
       - name: Install fluentbit
         if: steps.fluentbit-cache.outputs.cache-hit != 'true'
@@ -93,8 +89,6 @@ jobs:
             ~/go/pkg/mod
             ~/.cache/go-build
           key: loadtest-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - name: Install Dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload

diff --git a/.github/workflows/prometheus-compliance-tests.yml b/.github/workflows/prometheus-compliance-tests.yml
@@ -37,8 +37,6 @@ jobs:
             ~/go/pkg/mod
             ~/.cache/go-build
           key: prometheus-${{ runner.os }}-go-${{ hashFiles('**/go.mod', '**/go.sum') }}
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MIN: "10"
       - run: make otelcontribcol
         working-directory: opentelemetry-collector-contrib
       - name: Checkout compliance repo