Update CI to reference JOBID

rancherfederal · Jan 10, 2025 · 7ff796d · 7ff796d
1 parent 38caa8d
commit 7ff796d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/reusable_integration_testing.yml b/.github/workflows/reusable_integration_testing.yml
@@ -74,7 +74,7 @@ jobs:
         id: plan
         run: |
           cd testing/
-          terraform plan -var "GITHUB_RUN_ID=$GITHUB_RUN_ID" -var "os=${{ inputs.os }}" -no-color
+          terraform plan -var "GITHUB_RUN_ID=$GITHUB_RUN_ID" -var "GITHUB_JOB_ID=$GITHUB_JOB" -var "os=${{ inputs.os }}" -no-color
         continue-on-error: true
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -88,7 +88,7 @@ jobs:
       - name: Terraform Apply
         run: |
           cd testing/
-          terraform apply -var "GITHUB_RUN_ID=$GITHUB_RUN_ID" -var "os=${{ inputs.os }}" -auto-approve
+          terraform apply -var "GITHUB_RUN_ID=$GITHUB_RUN_ID" -var "GITHUB_JOB_ID=$GITHUB_JOB" -var "os=${{ inputs.os }}" -auto-approve
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -97,8 +97,8 @@ jobs:
       - name: Create inventory
         run: |
           mkdir ./${{ inputs.os }}
-          export RKE2_SERVER=$(aws ec2 describe-instances --filters "Name=instance-state-name,Values=running" "Name=tag:Owner,Values=rke2-ansible-github-actions" "Name=tag:NodeType,Values=Server" "Name=tag:github_run,Values=$GITHUB_RUN_ID" --query "Reservations[*].Instances[*].PublicIpAddress" --output text | head -1)
-          export RKE2_AGENT=$(aws ec2 describe-instances --filters "Name=instance-state-name,Values=running" "Name=tag:Owner,Values=rke2-ansible-github-actions" "Name=tag:NodeType,Values=Agent" "Name=tag:github_run,Values=$GITHUB_RUN_ID" --query "Reservations[*].Instances[*].PublicIpAddress" --output text | head -1)
+          export RKE2_SERVER=$(aws ec2 describe-instances --filters "Name=instance-state-name,Values=running" "Name=tag:Owner,Values=rke2-ansible-github-actions" "Name=tag:NodeType,Values=Server" "Name=tag:github_run,Values=$GITHUB_RUN_ID" "Name=tag:github_job,Values=$GITHUB_JOB_ID" --query "Reservations[*].Instances[*].PublicIpAddress" --output text | head -1)
+          export RKE2_AGENT=$(aws ec2 describe-instances --filters "Name=instance-state-name,Values=running" "Name=tag:Owner,Values=rke2-ansible-github-actions" "Name=tag:NodeType,Values=Agent" "Name=tag:github_run,Values=$GITHUB_RUN_ID" "Name=tag:github_job,Values=$GITHUB_JOB_ID" --query "Reservations[*].Instances[*].PublicIpAddress" --output text | head -1)
           yq --null-input '.rke2_cluster.children.rke2_servers.hosts.master-01.ansible_host = strenv(RKE2_SERVER)' > ./${{ inputs.os }}/hosts.yml
           yq -i '.all.vars.rke2_kubernetes_api_server_host = strenv(RKE2_SERVER)' ./${{ inputs.os }}/hosts.yml
           yq -i '.rke2_cluster.children.rke2_agents.hosts.worker-01.ansible_host = strenv(RKE2_AGENT)' ./${{ inputs.os }}/hosts.yml
@@ -134,7 +134,7 @@ jobs:
 
       - name: Update inventory hosts.yml with added host
         run: |
-          export RKE2_AGENT2=$(aws ec2 describe-instances --filters "Name=instance-state-name,Values=running" "Name=tag:Owner,Values=rke2-ansible-github-actions" "Name=tag:NodeType,Values=ExtraNode" "Name=tag:github_run,Values=$GITHUB_RUN_ID" --query "Reservations[*].Instances[*].PublicIpAddress" --output text | head -1)
+          export RKE2_AGENT2=$(aws ec2 describe-instances --filters "Name=instance-state-name,Values=running" "Name=tag:Owner,Values=rke2-ansible-github-actions" "Name=tag:NodeType,Values=ExtraNode" "Name=tag:github_run,Values=$GITHUB_RUN_ID" "Name=tag:github_job,Values=$GITHUB_JOB_ID --query "Reservations[*].Instances[*].PublicIpAddress" --output text | head -1)
           yq -i '.rke2_cluster.children.rke2_agents.hosts.worker-02.ansible_host = strenv(RKE2_AGENT2)' ./${{ inputs.os }}/hosts.yml
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -164,7 +164,7 @@ jobs:
         if: ${{ always() }}
         run: |
           cd testing/
-          terraform destroy -var "GITHUB_RUN_ID=$GITHUB_RUN_ID" -auto-approve
+          terraform destroy -var "GITHUB_RUN_ID=$GITHUB_RUN_ID" -var "GITHUB_JOB_ID=$GITHUB_JOB" -auto-approve
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

diff --git a/.github/workflows/rocky.yml b/.github/workflows/rocky.yml
@@ -16,6 +16,6 @@ jobs:
   "_9_":
     uses: ./.github/workflows/reusable_integration_testing.yml
     with: 
-      os: rocky8
+      os: rocky9
       ssh_user: centos
     secrets: inherit
diff --git a/testing/main.tf b/testing/main.tf
@@ -8,7 +8,7 @@ provider "aws" {
 ### SECURITY GROUPS
 ###
 resource "aws_security_group" "allow-all" {
-  name   = "${var.tf_user}-allow-all-${var.GITHUB_RUN_ID}"
+  name   = "${var.tf_user}-allow-all-${var.GITHUB_RUN_ID}-${var.GITHUB_JOB_ID}"
   vpc_id = "vpc-07402b459d3b18976"
 
   ingress {
@@ -30,6 +30,7 @@ resource "aws_security_group" "allow-all" {
     Name       = "allow-all"
     Owner      = var.tf_user
     github_run = "${var.GITHUB_RUN_ID}"
+    github_job = "${var.GITHUB_JOB_ID}"
   }
 }
 
@@ -52,10 +53,11 @@ resource "aws_instance" "control_node" {
   vpc_security_group_ids = [aws_security_group.allow-all.id]
 
   tags = {
-    Name       = "rke2_ansible-testing-server-${var.os}-${var.GITHUB_RUN_ID}-${count.index}"
+    Name       = "rke2_ansible-testing-server-${var.os}-${var.GITHUB_RUN_ID}-${var.GITHUB_JOB_ID}-${count.index}"
     Owner      = var.tf_user
     NodeType   = "Server"
     github_run = "${var.GITHUB_RUN_ID}"
+    github_job = "${var.GITHUB_JOB_ID}"
   }
 
   provisioner "remote-exec" {
@@ -89,10 +91,11 @@ resource "aws_instance" "worker_node" {
   }
 
   tags = {
-    Name       = "rke2_ansible-testing-agent-${var.os}-${var.GITHUB_RUN_ID}-${count.index}"
+    Name       = "rke2_ansible-testing-agent-${var.os}-${var.GITHUB_RUN_ID}-${var.GITHUB_JOB_ID}-${count.index}"
     Owner      = var.tf_user
     NodeType   = "Agent"
     github_run = "${var.GITHUB_RUN_ID}"
+    github_job = "${var.GITHUB_JOB_ID}"
   }
 
   provisioner "remote-exec" {
@@ -126,10 +129,11 @@ resource "aws_instance" "extra_worker_node" {
   }
 
   tags = {
-    Name       = "rke2_ansible-testing-agent-idempotency-${var.os}-${var.GITHUB_RUN_ID}-${count.index}"
+    Name       = "rke2_ansible-testing-agent-idempotency-${var.os}-${var.GITHUB_RUN_ID}-${var.GITHUB_JOB_ID}-${count.index}"
     Owner      = var.tf_user
     NodeType   = "ExtraNode"
     github_run = "${var.GITHUB_RUN_ID}"
+    github_job = "${var.GITHUB_JOB_ID}"
   }
 
   provisioner "remote-exec" {

diff --git a/testing/variables.tf b/testing/variables.tf
@@ -106,3 +106,4 @@ variable "ansible_user" {
 }
 
 variable "GITHUB_RUN_ID" {}
+variable "GITHUB_JOB_ID" {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -106,3 +106,4 @@ variable "ansible_user" {
		}

		variable "GITHUB_RUN_ID" {}
		variable "GITHUB_JOB_ID" {}