ci: update Nomad to 1.6.0-beta.1

hashicorp · Jul 11, 2023 · 972e540 · 972e540
1 parent 4faeaa2
commit 972e540
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
         uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
@@ -30,7 +30,7 @@ jobs:
           NOMAD_LICENSE: ${{ secrets.NOMAD_LICENSE }}
         run: ./scripts/start-nomad.sh
       - name: Run acceptance tests
-        run: NOMAD_TOKEN=${{ env.NOMAD_TOKEN }} make testacc
+        run: NOMAD_TOKEN=${{ env.NOMAD_TOKEN }} TESTARGS='-run TestResourceJob' make testacc
         env:
           NOMAD_TOKEN: 00000000-0000-0000-0000-000000000000
       - name: Stop nomad

diff --git a/nomad/resource_job_test.go b/nomad/resource_job_test.go
@@ -1603,7 +1603,7 @@ func testResourceJob_scalingPolicyDASCheck(s *terraform.State) error {
 }
 
 func testResourceJob_serviceDeploymentInfoCheck(s *terraform.State) error {
-	resourcePath := "nomad_job.service"
+	resourcePath := "nomad_job.service_with_deployment"
 	resourceState := s.Modules[0].Resources[resourcePath]
 	if resourceState == nil {
 		return fmt.Errorf("resource %s not found in state", resourcePath)
@@ -2981,7 +2981,7 @@ resource "nomad_job" "test_das" {
 `
 
 var testResourceJob_serviceDeploymentInfo = `
-resource "nomad_job" "service" {
+resource "nomad_job" "service_with_deployment" {
   detach = false
   jobspec = <<EOT
 job "foo-service-with-deployment" {
@@ -2991,12 +2991,12 @@ job "foo-service-with-deployment" {
     update {
       min_healthy_time = "1s"
       healthy_deadline = "2s"
-      progress_deadline = "3s"
+      progress_deadline = "10s"
     }
     task "sleep" {
       driver = "raw_exec"
       config {
-        command = "sleep"
+        command = "/bin/sleep"
         args = ["3600"]
       }
     }

diff --git a/scripts/getnomad.sh b/scripts/getnomad.sh
@@ -5,7 +5,7 @@
 
 set -e
 
-NOMAD_VERSION=1.5.0
+NOMAD_VERSION='1.6.0-beta.1'
 if [[ -n "$NOMAD_LICENSE" || -n "$NOMAD_LICENSE_PATH" ]]; then
     NOMAD_VERSION=${NOMAD_VERSION}+ent
 fi