backport of commit c9356b6

hashicorp · Oct 20, 2023 · 211e9ef · 211e9ef
1 parent 1280f45
commit 211e9ef
Show file tree

Hide file tree

Showing 55 changed files with 551 additions and 2,864 deletions.
diff --git a/.changelog/19218.txt b/.changelog/19218.txt
diff --git a/.changelog/19306.txt → .changelog/19274.txt b/.changelog/19306.txt → .changelog/19274.txt
diff --git a/.changelog/19311.txt b/.changelog/19311.txt
diff --git a/.github/workflows/nightly-test-1.17.x.yaml → .github/workflows/nightly-test-1.13.x.yaml b/.github/workflows/nightly-test-1.17.x.yaml → .github/workflows/nightly-test-1.13.x.yaml
@@ -1,16 +1,16 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-name: Nightly Frontend Test 1.17.x
+name: Nightly Frontend Test 1.13.x
 on:
   schedule:
     - cron: '0 4 * * *'
   workflow_dispatch: {}
 
 env:
   EMBER_PARTITION_TOTAL: 4        # Has to be changed in tandem with the matrix.partition
-  BRANCH: "release/1.17.x"
-  BRANCH_NAME: "release-1.17.x"   # Used for naming artifacts
+  BRANCH: "release/1.13.x"
+  BRANCH_NAME: "release-1.13.x"   # Used for naming artifacts
   GOPRIVATE: github.com/hashicorp # Required for enterprise deps
 
 jobs:

diff --git a/.github/workflows/nightly-test-integrations-1.17.x.yml b/.github/workflows/nightly-test-integrations-1.17.x.yml
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
@@ -81,6 +81,7 @@ jobs:
     strategy:
       matrix:
         nomad-version: ['v1.6.2', 'v1.5.9', 'v1.4.13']
+
     steps:
       - name: Checkout Nomad
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3

diff --git a/.github/workflows/verify-envoy-version.yml b/.github/workflows/verify-envoy-version.yml
@@ -13,6 +13,7 @@ on:
     branches:
       - main
       - release/**
+      - NET-6239
 
 env:
   SKIP_VERIFY_ENVOY_VERSION: "false" ## temporarily disabled; set to true to disable script