backport of commit 6de7523

Author: dependabot[bot]

.changelog/25792.txt

@@ -11,7 +11,7 @@ jobs:
   backport:
     if: github.event.pull_request.merged
     runs-on: ubuntu-22.04
-    container: hashicorpdev/backport-assistant:v0.5.7
+    container: hashicorpdev/backport-assistant:0.4.1
     steps:
       - name: Backport changes to stable-website
         run: |

.github/workflows/backport.yml

@@ -1,11 +1,7 @@
 name: Check Copywrite Headers
 
 on:
-  pull_request:
-  push:
-    branches:
-      - 'main'
-      - 'release/**'
+  push: {}
 
 jobs:
   copywrite:

.github/workflows/copywrite.yml

@@ -31,18 +31,16 @@ jobs:
         if: github.event.action == 'labeled' && github.event.label.name == 'hcc/jira'
         uses: tomhjp/gh-action-jira-create@3ed1789cad3521292e591a7cfa703215ec1348bf # v0.2.1
         with:
-          project: NMD
+          project: NET
           issuetype: "${{ steps.set-ticket-type.outputs.TYPE }}"
           summary: "${{ github.event.repository.name }} [${{ steps.set-ticket-type.outputs.TYPE }} #${{ github.event.issue.number }}]: ${{ github.event.issue.title }}"
           description: "${{ github.event.issue.body || github.event.pull_request.body }}\n\n_Created in GitHub by ${{ github.actor }}._"
-          # customfield_10089 is "Issue Link"
-          # customfield_10371 is "Source" (use JIRA API to retrieve)
-          # customerfield_10091 is "Team (R&D)
-          # customfield_10001 is Team (jira default teams?)
+          # customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve), customerfield_10091 is "Team (R&D)
           extraFields: '{ "customfield_10089": "${{ github.event.issue.html_url || github.event.pull_request.html_url }}",
-                          "customfield_10001": "72e166fb-d26c-4a61-b0de-7a290d91708f",
+                          "customfield_10371": { "value": "GitHub" },
+                          "customfield_10091": ["NomadMinor"],
                           "components": [{ "name": "nomad" }],
-                          "labels": ["community", "GitHub"] }'
+                          "labels": ["community"] }'
         env:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
           JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}

.github/workflows/jira-sync.yml

@@ -6,15 +6,14 @@
 
 schema = 1
 active_versions {
-  version "1.10.x" {
-    ce_active = true
-    lts       = true
-  }
   version "1.9.x" {
-    ce_active = true # needed for docs
+    ce_active = true
   }
   version "1.8.x" {
-    ce_active = true # needed for docs
+    ce_active = true
     lts       = true
   }
+  version "1.7.x" {
+    ce_active = true
+  }
 }

.release/versions.hcl

@@ -53,9 +53,9 @@ func runRegistry(t *testing.T) {
 
 	t.Logf("Setting up insecure private registry at %v", address)
 
-	// run the sed job to fix the auth.json file with the correct address and
-	// make sure the registry is marked as insecure for docker, otherwise pulls
-	// will fail.
+	// run the sed job to fixup the auth.json file with correct address and make
+	// sure the registry is marked as insecure for docker, otherwise pulls will
+	// fail
 	_, sedCleanup := jobs3.Submit(t,
 		"../docker_registry/registry-auths.hcl",
 		jobs3.Var("registry_address", address),
@@ -80,7 +80,7 @@ func runRegistry(t *testing.T) {
 }
 
 func testRedis(t *testing.T) {
-	job, cleanup := jobs3.Submit(t, "./input/redis.hcl", jobs3.Timeout(30*time.Second))
+	job, cleanup := jobs3.Submit(t, "./input/redis.hcl")
 	t.Cleanup(cleanup)
 
 	logs := job.TaskLogs("cache", "redis")

e2e/docker/docker_test.go

@@ -14,7 +14,6 @@ import (
 	"github.com/hashicorp/nomad/e2e/e2eutil"
 	"github.com/hashicorp/nomad/e2e/v3/jobs3"
 	"github.com/hashicorp/nomad/e2e/v3/volumes3"
-	"github.com/shoenig/test"
 	"github.com/shoenig/test/must"
 	"github.com/shoenig/test/wait"
 )
@@ -61,11 +60,6 @@ func TestDynamicHostVolumes_RegisterWorkflow(t *testing.T) {
 	must.NoError(t, err)
 	t.Logf("[%v] ACL policy for job %q created", time.Since(start), submitted.JobID())
 
-	t.Cleanup(func() {
-		_, err := nomad.ACLPolicies().Delete("register-volumes-policy", nil)
-		test.NoError(t, err)
-	})
-
 	must.NoError(t, e2eutil.Dispatch(submitted.JobID(),
 		map[string]string{
 			"vol_name": "registered-volume",

e2e/dynamic_host_volumes/dynamic_host_volumes_test.go

@@ -81,11 +81,15 @@ func testCountdash(t *testing.T) {
 }
 
 func testHTTP(t *testing.T) {
-	job, httpCleanup := jobs3.Submit(t, "./input/http.hcl")
-	t.Cleanup(httpCleanup)
+	job, _ := jobs3.Submit(t,
+		"./input/http.hcl",
+		jobs3.DisableCleanup(),
+	)
 
-	job2, httpCurlCleanup := jobs3.Submit(t, "./input/http_curl.hcl")
-	t.Cleanup(httpCurlCleanup)
+	job2, _ := jobs3.Submit(t,
+		"./input/http_curl.hcl",
+		jobs3.DisableCleanup(),
+	)
 
 	logs := job.TaskLogs("backend", "http")
 	must.StrContains(t, logs.Stderr, `"GET / HTTP/1.1" 200 -`)        // healthcheck

e2e/exec2/exec2_test.go

@@ -30,6 +30,5 @@ telemetry {
 }
 
 ui {
-  enabled        = true
   show_cli_hints = false
 }

e2e/terraform/provision-infra/provision-nomad/etc/nomad.d/base.hcl

@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "@playwright/test": "^1.52.0"
+    "@playwright/test": "^1.51.0"
   }
 }

e2e/ui/package-lock.json

@@ -33,7 +33,7 @@ EOF
 }
 
 
-IMAGE="mcr.microsoft.com/playwright:v1.52.0-jammy"
+IMAGE="mcr.microsoft.com/playwright:v1.51.0-jammy"
 pushd $(dirname "${BASH_SOURCE[0]}") > /dev/null
 
 run_tests() {

e2e/ui/package.json

@@ -38,7 +38,7 @@ while true; do
     checkAllocsCount && break
 
     if [ "$elapsed_time" -ge "$MAX_WAIT_TIME" ]; then
-        error_exit "Some allocs are not running: $(nomad alloc status -json | jq -r '.[] | "\(.ID) \(.Name) \(.ClientStatus)"')"
+        error_exit "Some allocs are not running:\n$(nomad alloc status -json | jq -r '.[] | select(.ClientStatus != "running") | .ID')"
     fi
 
     echo "Running allocs: $allocs_length, expected $ALLOC_COUNT. Waiting for $elapsed_time  Retrying in $POLL_INTERVAL seconds..."

e2e/ui/run.sh

@@ -51,7 +51,7 @@ resource "enos_local_exec" "set_metadata" {
   scripts = [abspath("${path.module}/scripts/set_metadata.sh")]
 }
 
-resource "enos_local_exec" "get_alloc_info" {
+resource "enos_local_exec" "get_alloc_ids" {
 
   environment = merge(
     local.nomad_env,
@@ -61,13 +61,14 @@ resource "enos_local_exec" "get_alloc_info" {
   )
 
   inline = [
-  "nomad alloc status -json | jq -r --arg NODE_ID \"$(nomad node status -allocs -address https://$CLIENT_IP:4646 -self -json | jq -r '.ID')\" '[ .[] | select(.NodeID == $NODE_ID) | {ID: .ID, Name: .Name, ClientStatus: .ClientStatus, TaskStates: .TaskStates}]'"]
+    "nomad alloc status -json | jq -r --arg NODE_ID \"$(nomad node status -allocs -address https://$CLIENT_IP:4646 -self -json | jq -r '.ID')\" '[.[] | select(.ClientStatus == \"running\" and .NodeID == $NODE_ID) | .ID] | join(\" \")'"
+  ]
 }
 
 module "upgrade_client" {
   depends_on = [
     enos_local_exec.set_metadata,
-    enos_local_exec.get_alloc_info,
+    enos_local_exec.get_alloc_ids,
   ]
 
   source = "../upgrade_instance"
@@ -107,7 +108,7 @@ resource "enos_local_exec" "verify_allocs" {
     local.nomad_env,
     {
       CLIENT_IP = var.client
-      ALLOCS    = enos_local_exec.get_alloc_info.stdout
+      ALLOCS    = enos_local_exec.get_alloc_ids.stdout
   })
 
   scripts = [abspath("${path.module}/scripts/verify_allocs.sh")]

enos/modules/test_cluster_health/scripts/allocs.sh

@@ -48,59 +48,22 @@ done
 
 echo "Client $client_id at $CLIENT_IP is ready"
 
-allocs_count=$(echo $ALLOCS |jq '[ .[] | select(.ClientStatus == "running")] | length')
-echo "$allocs_count allocs found before upgrade $ALLOCS"
-
-# Quality: "nomad_alloc_reconnect: A GET call to /v1/allocs will return the same IDs for running allocs before and after a client upgrade on each client"
-
-checkAllocsCount() {
-    local allocs
-    running_allocs=$(nomad alloc status -json | jq -r --arg client_id "$client_id" '[.[] | select(.ClientStatus == "running" and .NodeID == $client_id)]') \
-        || error_exit "Failed to check alloc status"
-    allocs_length=$(echo "$running_allocs" | jq 'length') \
-        || error_exit "Invalid alloc status -json output"
-
-    if [ "$allocs_length" -eq "$allocs_count" ]; then
-        return 0
-    fi
-
-    return 1
-}
-
+# Quality: "nomad_alloc_reconect: A GET call to /v1/allocs will return the same IDs for running allocs before and after a client upgrade on each client"
 echo "Reading allocs for client at $CLIENT_IP"
 
-elapsed_time=0
-while true; do
-    checkAllocsCount && break
-
-    if [ "$elapsed_time" -ge "$MAX_WAIT_TIME" ]; then
-        error_exit "Some allocs are not running: $(nomad alloc status -json | jq -r '.[] | "\(.ID) \(.Name) \(.ClientStatus)"')"
-    fi
-
-    echo "Running allocs: $allocs_length, expected $allocs_count. Waiting for $elapsed_time  Retrying in $POLL_INTERVAL seconds..."
-    sleep $POLL_INTERVAL
-    elapsed_time=$((elapsed_time + POLL_INTERVAL))
-
-done
-
-echo "Correct number of allocs found running: $allocs_length"
-
 current_allocs=$(nomad alloc status -json | jq -r --arg client_id "$client_id" '[.[] | select(.ClientStatus == "running" and .NodeID == $client_id) | .ID] | join(" ")')
 if [ -z "$current_allocs" ]; then
     error_exit "Failed to read allocs for node: $client_id"
 fi
 
-IDs=$(echo $ALLOCS | jq '[ .[] | select(.ClientStatus == "running")] | [.[].ID] | join(" ")')
-
-IFS=' ' read -r -a INPUT_ARRAY <<< "${IDs[*]}"
+IFS=' ' read -r -a INPUT_ARRAY <<< "${ALLOCS[*]}"
 IFS=' ' read -r -a RUNNING_ARRAY <<< "$current_allocs"
 
 sorted_input=($(printf "%s\n" "${INPUT_ARRAY[@]}" | sort))
 sorted_running=($(printf "%s\n" "${RUNNING_ARRAY[@]}" | sort))
 
 if [[ "${sorted_input[*]}" != "${sorted_running[*]}" ]]; then
-    full_current_allocs=$(nomad alloc status -json | jq -r --arg client_id "$client_id" '[.[] | select(.NodeID == $client_id) | { ID: .ID, Name: .Name, ClientStatus: .ClientStatus}]')
-    error_exit "Different allocs found, expected: ${sorted_input[*]} found: ${sorted_running[*]}. Current allocs info: $full_current_allocs"
+    error_exit "Different allocs found, expected: ${sorted_input[*]} found: ${sorted_running[*]}"
 fi
 
 echo "All allocs reattached correctly for node at $CLIENT_IP"

enos/modules/upgrade_client/main.tf

@@ -36,27 +36,19 @@ locals {
 resource "random_pet" "upgrade" {
 }
 
-
-
 resource "enos_local_exec" "wait_for_leader" {
   environment = local.nomad_env
 
   scripts = [abspath("${path.module}/scripts/wait_for_stable_cluster.sh")]
 }
 
-resource "time_sleep" "wait_20_seconds" {
-  depends_on = [enos_local_exec.wait_for_leader]
-
-  create_duration = "20s"
-}
-
 // Forcing a snapshot from the leader drives the cluster to store the most recent
 // state and exercise the snapshot restore at least once when upgrading.
 // The resulting file wont be used. 
 // The stale flag defaults to "false" but it is included to reinforce the fact
 // that it has to be taken from the leader for future readers.
 resource "enos_local_exec" "take_cluster_snapshot" {
-  depends_on = [time_sleep.wait_20_seconds]
+  depends_on = [enos_local_exec.wait_for_leader]
 
   environment = local.nomad_env