Skip to content

Commit

Permalink
backport of commit 888e302
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhiaayachi
dhiaayachi committed Sep 17, 2024
1 parent e0785bc commit 352170a
Show file tree
Hide file tree
Showing 1,296 changed files with 187,058 additions and 2,180 deletions.
3 changes: 0 additions & 3 deletions .changelog/21592.txt
View file

This file was deleted.

3 changes: 0 additions & 3 deletions .changelog/21616.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/backport-assistant.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
backport:
if: github.event.pull_request.merged
runs-on: ubuntu-latest
container: hashicorpdev/backport-assistant:0.4.4
container: hashicorpdev/backport-assistant:0.4.1
steps:
- name: Run Backport Assistant for release branches
run: |
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/ce-merge-trigger.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ on:
branches:
- main
- release/**
- '!release/1.18**'
- '!release/1.17**'
- '!release/1.16**'
- '!release/1.15**'


jobs:
trigger-ce-merge:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/nightly-test-1.19.x.yaml → .github/workflows/nightly-test-1.14.x.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

name: Nightly Frontend Test 1.19.x
name: Nightly Frontend Test 1.14.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.19.x"
BRANCH_NAME: "release-1.19.x" # Used for naming artifacts
BRANCH: "release/1.14.x"
BRANCH_NAME: "release-1.14.x" # Used for naming artifacts
GOPRIVATE: github.com/hashicorp # Required for enterprise deps

jobs:
Expand All @@ -24,7 +24,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/nightly-test-1.15.x.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,8 @@ env:
GOPRIVATE: github.com/hashicorp # Required for enterprise deps

jobs:
check-ent:
runs-on: ubuntu-latest
if: ${{ endsWith(github.repository, '-enterprise') }}
steps:
- run: echo "Building Enterprise"

frontend-test-workspace-node:
runs-on: ubuntu-latest
needs: [check-ent]
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
Expand Down Expand Up @@ -52,7 +45,6 @@ jobs:

frontend-build-ce:
runs-on: ubuntu-latest
needs: [check-ent]
env:
JOBS: 2
CONSUL_NSPACES_ENABLED: 0
Expand Down Expand Up @@ -125,7 +117,6 @@ jobs:

frontend-build-ent:
runs-on: ubuntu-latest
needs: [check-ent]
env:
JOBS: 2
CONSUL_NSPACES_ENABLED: 1
Expand Down
27 changes: 9 additions & 18 deletions .github/workflows/nightly-test-1.18.x.yaml → .github/workflows/nightly-test-1.16.x.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: MPL-2.0

name: Nightly Frontend Test 1.18.x
name: Nightly Frontend Test 1.16.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.18.x"
BRANCH_NAME: "release-1.18.x" # Used for naming artifacts
BRANCH: "release/1.16.x"
BRANCH_NAME: "release-1.16.x" # Used for naming artifacts
GOPRIVATE: github.com/hashicorp # Required for enterprise deps

jobs:
check-ent:
runs-on: ubuntu-latest
if: ${{ endsWith(github.repository, '-enterprise') }}
steps:
- run: echo "Building Enterprise"

frontend-test-workspace-node:
runs-on: ubuntu-latest
needs: [check-ent]
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
Expand All @@ -31,7 +24,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand All @@ -52,7 +45,6 @@ jobs:

frontend-build-ce:
runs-on: ubuntu-latest
needs: [check-ent]
env:
JOBS: 2
CONSUL_NSPACES_ENABLED: 0
Expand All @@ -64,7 +56,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -103,7 +95,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand All @@ -125,7 +117,6 @@ jobs:

frontend-build-ent:
runs-on: ubuntu-latest
needs: [check-ent]
env:
JOBS: 2
CONSUL_NSPACES_ENABLED: 1
Expand All @@ -137,7 +128,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -176,7 +167,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -207,7 +198,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 18
node-version: 14
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/nightly-test-1.17.x.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,8 @@ env:
GOPRIVATE: github.com/hashicorp # Required for enterprise deps

jobs:
check-ent:
runs-on: ubuntu-latest
if: ${{ endsWith(github.repository, '-enterprise') }}
steps:
- run: echo "Building Enterprise"

frontend-test-workspace-node:
runs-on: ubuntu-latest
needs: [check-ent]
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
Expand Down Expand Up @@ -52,7 +45,6 @@ jobs:

frontend-build-ce:
runs-on: ubuntu-latest
needs: [check-ent]
env:
JOBS: 2
CONSUL_NSPACES_ENABLED: 0
Expand Down Expand Up @@ -125,7 +117,6 @@ jobs:

frontend-build-ent:
runs-on: ubuntu-latest
needs: [check-ent]
env:
JOBS: 2
CONSUL_NSPACES_ENABLED: 1
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/nightly-test-integ-peering_commontopo.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Nightly test integrations - peering_common_topo
on:
schedule:
# Run nightly at 12AM UTC/8PM EST/5PM PST
- cron: '0 0 * * *'
- cron: '* 0 * * *'
workflow_dispatch: {}

env:
Expand Down Expand Up @@ -39,20 +39,12 @@ jobs:

get-go-version:
uses: ./.github/workflows/reusable-get-go-version.yml
with:
ref: ${{ inputs.branch }}

get-envoy-versions:
uses: ./.github/workflows/reusable-get-envoy-versions.yml
with:
ref: ${{ inputs.branch }}

tests:
runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl ) }}
needs:
- setup
- get-go-version
- get-envoy-versions
permissions:
id-token: write # NOTE: this permission is explicitly required for Vault auth.
contents: read
Expand All @@ -70,7 +62,7 @@ jobs:
name: '${{matrix.test-case}}'

env:
ENVOY_VERSION: ${{ needs.get-envoy-versions.outputs.max-envoy-version }}
ENVOY_VERSION: "1.29.5"
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
# NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
Expand Down
Loading

0 comments on commit 352170a

Please sign in to comment.