backport of commit 3c95f15

.github/enos-run-matrices/ent.json

@@ -0,0 +1,24 @@
+{
+  "include": [
+    {
+      "scenario": "smoke backend:consul consul_version:1.12.3 distro:ubuntu seal:awskms arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "smoke backend:raft consul_version:1.12.3 distro:ubuntu seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.11.7 distro:rhel seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.11.7 distro:rhel seal:awskms arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "autopilot distro:ubuntu seal:shamir arch:amd64 builder:crt edition:ent",
+      "aws_region": "us-west-1"
+    }
+  ]
+}

.github/enos-run-matrices/oss.json

@@ -0,0 +1,20 @@
+{
+  "include": [
+    {
+      "scenario": "smoke backend:consul consul_version:1.12.3 distro:ubuntu seal:awskms arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "smoke backend:raft consul_version:1.12.3 distro:ubuntu seal:shamir arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-2"
+    },
+    {
+      "scenario": "upgrade backend:raft consul_version:1.11.7 distro:rhel seal:shamir arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-1"
+    },
+    {
+      "scenario": "upgrade backend:consul consul_version:1.11.7 distro:rhel seal:awskms arch:amd64 builder:crt edition:oss",
+      "aws_region": "us-west-2"
+    }
+  ]
+}

.github/workflows/backport.yml

@@ -11,11 +11,11 @@ jobs:
   backport-targeted-release-branch:
     if: github.event.pull_request.merged
     runs-on: ubuntu-latest
-    container: hashicorpdev/backport-assistant:0.3.0
+    container: hashicorpdev/backport-assistant:0.2.5
     steps:
       - name: Backport changes to targeted release branch
         run: |
-          backport-assistant backport -merge-method=squash -gh-automerge 
+          backport-assistant backport
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.[+\\w]+)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"

.github/workflows/build-vault-oss.yml

@@ -58,6 +58,8 @@ jobs:
           GOARCH: ${{ inputs.goarch }}
           GOOS: ${{ inputs.goos }}
           GO_TAGS: ${{ inputs.go-tags }}
+          # We started stripping symbol tables in 1.13.x
+          KEEP_SYMBOLS: true
         run: make crt-build
       - name: Determine artifact basename
         env:

.github/workflows/enos-run.yml

@@ -107,8 +107,6 @@ jobs:
           ENOS_VAR_aws_ssh_keypair_name: enos-ci-ssh-key
           ENOS_VAR_aws_ssh_private_key_path: ./support/private_key.pem
           ENOS_VAR_tfc_api_token: ${{ secrets.TF_API_TOKEN }}
-          ENOS_VAR_artifactory_username: ${{ secrets.ARTIFACTORY_USER }}
-          ENOS_VAR_artifactory_token: ${{ secrets.ARTIFACTORY_TOKEN }}
           ENOS_VAR_terraform_plugin_cache_dir: ./support/terraform-plugin-cache
           ENOS_VAR_vault_build_date: ${{ env.ARTIFACT_BUILD_DATE }}
           ENOS_VAR_vault_product_version: ${{ env.ARTIFACT_VERSION }}
@@ -124,8 +122,6 @@ jobs:
           ENOS_VAR_aws_ssh_keypair_name: enos-ci-ssh-key
           ENOS_VAR_aws_ssh_private_key_path: ./support/private_key.pem
           ENOS_VAR_tfc_api_token: ${{ secrets.TF_API_TOKEN }}
-          ENOS_VAR_artifactory_username: ${{ secrets.ARTIFACTORY_USER }}
-          ENOS_VAR_artifactory_token: ${{ secrets.ARTIFACTORY_TOKEN }}
           ENOS_VAR_terraform_plugin_cache_dir: ./support/terraform-plugin-cache
           ENOS_VAR_vault_build_date: ${{ env.ARTIFACT_BUILD_DATE }}
           ENOS_VAR_vault_product_version: ${{ env.ARTIFACT_VERSION }}
@@ -143,8 +139,6 @@ jobs:
           ENOS_VAR_aws_ssh_keypair_name: enos-ci-ssh-key
           ENOS_VAR_aws_ssh_private_key_path: ./support/private_key.pem
           ENOS_VAR_tfc_api_token: ${{ secrets.TF_API_TOKEN }}
-          ENOS_VAR_artifactory_username: ${{ secrets.ARTIFACTORY_USER }}
-          ENOS_VAR_artifactory_token: ${{ secrets.ARTIFACTORY_TOKEN }}
           ENOS_VAR_terraform_plugin_cache_dir: ./support/terraform-plugin-cache
           ENOS_VAR_vault_build_date: ${{ env.ARTIFACT_BUILD_DATE }}
           ENOS_VAR_vault_product_version: ${{ env.ARTIFACT_VERSION }}

.gitignore

@@ -119,4 +119,3 @@ website/components/node_modules
 
 .buildcache/
 .releaser/
-*.log

.release/ci.hcl

@@ -187,6 +187,7 @@ event "enos-verify-stable" {
     on = "fail"
   }
 }
+
 ## These events are publish and post-publish events and should be added to the end of the file
 ## after the verify event stanza.