mirror of https://github.com/linkerd/linkerd2.git
Re-enable ARM integration tests (#5796)
* Revert "release: Disable ARM tests (#5778)"
This reverts commit e095d44eac.
* Only run the deep test in ARM
This commit is contained in:
parent
7194ccda5a
commit
8dd6d95d2b
|
|
@ -136,65 +136,63 @@ jobs:
|
||||||
# Validate the CLI version matches the current build tag.
|
# Validate the CLI version matches the current build tag.
|
||||||
[[ "$TAG" == "$($CMD version --short --client)" ]]
|
[[ "$TAG" == "$($CMD version --short --client)" ]]
|
||||||
bin/tests --images skip --name ${{ matrix.integration_test }} "$CMD"
|
bin/tests --images skip --name ${{ matrix.integration_test }} "$CMD"
|
||||||
|
arm64_integration_tests:
|
||||||
# arm64_integration_tests:
|
name: ARM64 integration tests
|
||||||
# name: ARM64 integration tests
|
timeout-minutes: 60
|
||||||
# timeout-minutes: 60
|
runs-on: ubuntu-20.04
|
||||||
# runs-on: ubuntu-20.04
|
needs: [docker_build]
|
||||||
# needs: [docker_build]
|
steps:
|
||||||
# steps:
|
- name: Checkout code
|
||||||
# - name: Checkout code
|
#if: startsWith(github.ref, 'refs/tags/stable')
|
||||||
# #if: startsWith(github.ref, 'refs/tags/stable')
|
# actions/checkout@v2
|
||||||
# # actions/checkout@v2
|
uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
|
||||||
# uses: actions/checkout@722adc63f1aa60a57ec37892e133b1d319cae598
|
- name: Try to load cached Go modules
|
||||||
# - name: Try to load cached Go modules
|
#if: startsWith(github.ref, 'refs/tags/stable')
|
||||||
# #if: startsWith(github.ref, 'refs/tags/stable')
|
# actions/cache@v1.1.2
|
||||||
# # actions/cache@v1.1.2
|
uses: actions/cache@70655ec8323daeeaa7ef06d7c56e1b9191396cbe
|
||||||
# uses: actions/cache@70655ec8323daeeaa7ef06d7c56e1b9191396cbe
|
with:
|
||||||
# with:
|
path: ~/go/pkg/mod
|
||||||
# path: ~/go/pkg/mod
|
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
||||||
# key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
restore-keys: |
|
||||||
# restore-keys: |
|
${{ runner.os }}-go-
|
||||||
# ${{ runner.os }}-go-
|
- name: Install linkerd CLI
|
||||||
# - name: Install linkerd CLI
|
#if: startsWith(github.ref, 'refs/tags/stable')
|
||||||
# #if: startsWith(github.ref, 'refs/tags/stable')
|
run: |
|
||||||
# run: |
|
TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
|
||||||
# TAG="$(CI_FORCE_CLEAN=1 bin/root-tag)"
|
CMD="$PWD/target/release/linkerd2-cli-$TAG-linux-amd64"
|
||||||
# CMD="$PWD/target/release/linkerd2-cli-$TAG-linux-amd64"
|
bin/docker-pull-binaries $TAG
|
||||||
# bin/docker-pull-binaries $TAG
|
$CMD version --client
|
||||||
# $CMD version --client
|
# validate CLI version matches the repo
|
||||||
# # validate CLI version matches the repo
|
[[ "$TAG" == "$($CMD version --short --client)" ]]
|
||||||
# [[ "$TAG" == "$($CMD version --short --client)" ]]
|
echo "Installed Linkerd CLI version: $TAG"
|
||||||
# echo "Installed Linkerd CLI version: $TAG"
|
echo "CMD=$CMD" >> $GITHUB_ENV
|
||||||
# echo "CMD=$CMD" >> $GITHUB_ENV
|
- name: Set KUBECONFIG environment variables
|
||||||
# - name: Set KUBECONFIG environment variables
|
#if: startsWith(github.ref, 'refs/tags/stable')
|
||||||
# #if: startsWith(github.ref, 'refs/tags/stable')
|
run: |
|
||||||
# run: |
|
mkdir -p $HOME/.kube
|
||||||
# mkdir -p $HOME/.kube
|
echo "${{ secrets.ARM64_KUBECONFIG }}" > $HOME/.kube/config
|
||||||
# echo "${{ secrets.ARM64_KUBECONFIG }}" > $HOME/.kube/config
|
echo "KUBECONFIG=$HOME/.kube/config" >> $GITHUB_ENV
|
||||||
# echo "KUBECONFIG=$HOME/.kube/config" >> $GITHUB_ENV
|
kubectl cluster-info
|
||||||
# kubectl cluster-info
|
- name: Run integration tests
|
||||||
# - name: Run integration tests
|
#if: startsWith(github.ref, 'refs/tags/stable')
|
||||||
# #if: startsWith(github.ref, 'refs/tags/stable')
|
env:
|
||||||
# env:
|
RUN_ARM_TEST: 1
|
||||||
# RUN_ARM_TEST: 1
|
run: bin/tests --name deep --images skip --skip-cluster-create "$CMD"
|
||||||
# run: bin/tests --images skip --skip-cluster-create "$CMD"
|
- name: CNI tests
|
||||||
# - name: CNI tests
|
#if: startsWith(github.ref, 'refs/tags/stable')
|
||||||
# #if: startsWith(github.ref, 'refs/tags/stable')
|
run: |
|
||||||
# run: |
|
export TAG="$($CMD version --client --short)"
|
||||||
# export TAG="$($CMD version --client --short)"
|
go test -cover -race -v -mod=readonly ./cni-plugin/test -integration-tests
|
||||||
# go test -cover -race -v -mod=readonly ./cni-plugin/test -integration-tests
|
- name: Test cleanup
|
||||||
# - name: Test cleanup
|
if: ${{ always() }}
|
||||||
# if: ${{ always() }}
|
# will fail if other steps didn't run, so ignore error
|
||||||
# # will fail if other steps didn't run, so ignore error
|
run: bin/test-cleanup "$CMD" || true
|
||||||
# run: bin/test-cleanup "$CMD" || true
|
|
||||||
|
|
||||||
choco_pack:
|
choco_pack:
|
||||||
# only runs for stable tags. The conditionals are at each step level instead of the job level
|
# only runs for stable tags. The conditionals are at each step level instead of the job level
|
||||||
# otherwise the jobs below that depend on this one won't run
|
# otherwise the jobs below that depend on this one won't run
|
||||||
name: Pack Chocolatey release
|
name: Pack Chocolatey release
|
||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
needs: [integration_tests] #, arm64_integration_tests]
|
needs: [integration_tests, arm64_integration_tests]
|
||||||
runs-on: windows-2019
|
runs-on: windows-2019
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue