tests: remove versions from branches

uselagoon · Jul 25, 2024 · c2929cd · c2929cd
1 parent e4f829c
commit c2929cd
Show file tree

Hide file tree

Showing 27 changed files with 20 additions and 42 deletions.
diff --git a/tests/tests/api.yaml b/tests/tests/api.yaml
@@ -12,15 +12,13 @@
 - ansible.builtin.import_playbook: api/deploy-pullrequest.yaml
   vars:
     testname: "API {{ cluster_type|upper }} - deploy pullrequest"
-    node_version: 16
     git_repo_name: api.git
     project: ci-api-{{ cluster_type }}
     check_url: "http://node.{{ project | regex_replace('_', '-') }}.pr-1.{{ route_suffix }}"
 
 - ansible.builtin.import_playbook: api/deploy-branch.yaml
   vars:
     testname: "API {{ cluster_type|upper }} - deploy regular branch api/slash/branch"
-    node_version: 16
     git_repo_name: api.git
     project: ci-api-{{ cluster_type }}
     branch: api/slash/branch
@@ -29,7 +27,6 @@
 # - ansible.builtin.import_playbook: api/deploy-branch-once.yaml
 #   vars:
 #     testname: "API {{ cluster_type|upper }} - deploy regular branch, name ends with -"
-#     node_version: 16
 #     git_repo_name: api.git
 #     project: ci-api-{{ cluster_type }}
 #     branch: some-branch-name-
@@ -38,7 +35,6 @@
 # - ansible.builtin.import_playbook: api/deploy-branch-once.yaml
 #   vars:
 #     testname: "API {{ cluster_type|upper }} - deploy regular branch, name contains only numbers"
-#     node_version: 16
 #     git_repo_name: api.git
 #     project: ci-api-{{ cluster_type }}
 #     branch: 1234567890
@@ -47,7 +43,6 @@
 # - ansible.builtin.import_playbook: api/deploy-branch-once.yaml
 #   vars:
 #     testname: "API {{ cluster_type|upper }} - deploy regular branch, name contains --"
-#     node_version: 16
 #     git_repo_name: api.git
 #     project: ci-api-{{ cluster_type }}
 #     branch: api--branch
@@ -56,7 +51,6 @@
 - ansible.builtin.import_playbook: api/promote.yaml
   vars:
     testname: "API {{ cluster_type|upper }} - promote branch"
-    node_version: 16
     git_repo_name: api.git
     project: ci-api-{{ cluster_type }}
     source_environment: source

diff --git a/tests/tests/api/deploy-branch-once.yaml b/tests/tests/api/deploy-branch-once.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/api/deploy-branch.yaml b/tests/tests/api/deploy-branch.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/api/deploy-pullrequest.yaml b/tests/tests/api/deploy-pullrequest.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
     branch: "pullrequest_base"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml

diff --git a/tests/tests/api/promote.yaml b/tests/tests/api/promote.yaml
@@ -2,7 +2,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
     branch: "{{ source_environment }}"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml

diff --git a/tests/tests/api/push.yaml b/tests/tests/api/push.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/bitbucket.yaml b/tests/tests/bitbucket.yaml
@@ -8,7 +8,6 @@
 - ansible.builtin.import_playbook: bitbucket/branch.yaml
   vars:
     testname: "BITBUCKET {{ cluster_type|upper }} - slash branch"
-    node_version: 16
     git_repo_name: bitbucket.git
     git_repo_full_name: git/bitbucket
     git_repo_url: "http://{{ lookup('env','GIT_HOST') }}:{{ lookup('env','GIT_PORT') }}/git/bitbucket"
@@ -20,7 +19,6 @@
 - ansible.builtin.import_playbook: github/skip-deployment.yaml
   vars:
     testname: "BITBUCKET {{ cluster_type|upper }} - skip deployment"
-    node_version: 16
     git_repo_name: bitbucket.git
     git_repo_full_name: git/bitbucket
     git_repo_url: "http://{{ lookup('env','GIT_HOST') }}:{{ lookup('env','GIT_PORT') }}/git/bitbucket"
@@ -32,7 +30,6 @@
 - ansible.builtin.import_playbook: bitbucket/pullrequest.yaml
   vars:
     testname: "BITBUCKET {{ cluster_type|upper }} - PULLREQUEST"
-    node_version: 16
     git_repo_name: bitbucket.git
     git_repo_full_name: git/bitbucket
     git_repo_url: "http://{{ lookup('env','GIT_HOST') }}:{{ lookup('env','GIT_PORT') }}/git/bitbucket"

diff --git a/tests/tests/bitbucket/branch.yaml b/tests/tests/bitbucket/branch.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/bitbucket/pullrequest.yaml b/tests/tests/bitbucket/pullrequest.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
     branch: "pullrequest_base"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml

diff --git a/tests/tests/bitbucket/skip-deployment.yaml b/tests/tests/bitbucket/skip-deployment.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/features-kubernetes.yaml b/tests/tests/features-kubernetes.yaml
@@ -54,7 +54,6 @@
 - ansible.builtin.import_playbook: features/remote-shell.yaml
   vars:
     testname: "REMOTE SHELL {{ cluster_type|upper }}"
-    node_version: 16
     git_repo_name: features.git
     project: ci-features-{{ cluster_type }}
     branch: remoteshell
@@ -73,7 +72,6 @@
 # - ansible.builtin.import_playbook: features/openshift-limit.yaml
 #   vars:
 #     testname: "openshift-character-limit {{ cluster_type|upper }}"
-#     node_version: 16
 #     git_repo_name: features.git
 #     project: ci-features-{{ cluster_type }}
 #     branch: very-long-branch-name-what-would-otherwise-overflow-the-sixty-three-limit

diff --git a/tests/tests/features/limits.yaml b/tests/tests/features/limits.yaml
@@ -2,7 +2,6 @@
 - ansible.builtin.import_playbook: ../api/push.yaml
   vars:
     testname: "environment limits - allow production"
-    node_version: 16
     git_repo_name: node.git
     project: ci-env-limit
     branch: master
@@ -12,7 +11,6 @@
 - ansible.builtin.import_playbook: ../api/push.yaml
   vars:
     testname: "environment limits - allow deployment of existing branch"
-    node_version: 16
     git_repo_name: node.git
     project: ci-env-limit
     branch: stage
@@ -22,7 +20,6 @@
 - ansible.builtin.import_playbook: ../api/push.yaml
   vars:
     testname: "environment limits - prevent deployment of new branch"
-    node_version: 16
     git_repo_name: node.git
     project: ci-env-limit
     branch: will-not-deploy

diff --git a/tests/tests/features/remote-shell.yaml b/tests/tests/features/remote-shell.yaml
@@ -2,7 +2,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/features/remote-ssh-legacy.yaml b/tests/tests/features/remote-ssh-legacy.yaml
@@ -2,7 +2,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/github.yaml b/tests/tests/github.yaml
@@ -8,7 +8,6 @@
 - ansible.builtin.import_playbook: github/branch.yaml
   vars:
     testname: "GITHUB {{ cluster_type|upper }} - slash branch"
-    node_version: 16
     git_repo_name: github.git
     project: ci-github-{{ cluster_type }}
     branch: github/slash/branch
@@ -18,7 +17,6 @@
 - ansible.builtin.import_playbook: github/branch-picky.yaml
   vars:
     testname: "GITHUB {{ cluster_type|upper }} - picky branch"
-    node_version: 16
     git_repo_name: github.git
     project: ci-github-{{ cluster_type }}
     branch: github/slash/banana
@@ -27,7 +25,6 @@
 - ansible.builtin.import_playbook: github/pullrequest.yaml
   vars:
     testname: "GITHUB {{ cluster_type|upper }} - PULLREQUEST"
-    node_version: 16
     git_repo_name: github.git
     project: ci-github-{{ cluster_type }}
     check_url: "http://node.{{ project | regex_replace('_', '-') }}.pr-1.{{ route_suffix }}"
@@ -36,7 +33,6 @@
   vars:
     testname: "GITHUB {{ cluster_type|upper }} - skip deployment"
     branch: skip
-    node_version: 16
     git_repo_name: github.git
     project: ci-github-{{ cluster_type }}
     check_url: "http://node.{{ project | regex_replace('_', '-') }}.skip.{{ route_suffix }}"

diff --git a/tests/tests/github/branch-picky.yaml b/tests/tests/github/branch-picky.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/github/branch.yaml b/tests/tests/github/branch.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/github/pullrequest.yaml b/tests/tests/github/pullrequest.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
     branch: "pullrequest_base"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml

diff --git a/tests/tests/github/skip-deployment.yaml b/tests/tests/github/skip-deployment.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/gitlab.yaml b/tests/tests/gitlab.yaml
@@ -8,7 +8,6 @@
 - ansible.builtin.import_playbook: gitlab/skip-deployment.yaml
   vars:
     testname: "GITLAB {{ cluster_type|upper }} - skip deployment"
-    node_version: 16
     git_repo_name: gitlab.git
     project: ci-gitlab-{{ cluster_type }}
     branch: skip
@@ -17,7 +16,6 @@
 - ansible.builtin.import_playbook: gitlab/branch.yaml
   vars:
     testname: "GITLAB {{ cluster_type|upper }} - slash branch"
-    node_version: 16
     git_repo_name: gitlab.git
     project: ci-gitlab-{{ cluster_type }}
     branch: gitlab/slash/branch
@@ -26,7 +24,6 @@
 - ansible.builtin.import_playbook: gitlab/pullrequest.yaml
   vars:
     testname: "GITLAB {{ cluster_type|upper }} - PULLREQUEST"
-    node_version: 16
     git_repo_name: gitlab.git
     project: ci-gitlab-{{ cluster_type }}
     check_url: "http://node.{{ project | regex_replace('_', '-') }}.pr-1.{{ route_suffix }}"

diff --git a/tests/tests/gitlab/branch.yaml b/tests/tests/gitlab/branch.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/gitlab/pullrequest.yaml b/tests/tests/gitlab/pullrequest.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
     branch: "pullrequest_base"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml

diff --git a/tests/tests/gitlab/skip-deployment.yaml b/tests/tests/gitlab/skip-deployment.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "node{{ node_version }}/"
+    git_files: "node/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/python/deploy-branch.yaml b/tests/tests/python/deploy-branch.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "python{{ python_version }}/"
+    git_files: "python/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/python/deploy-pullrequest.yaml b/tests/tests/python/deploy-pullrequest.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "python{{ python_version }}/"
+    git_files: "python/"
     branch: "pullrequest_base"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml

diff --git a/tests/tests/python/push.yaml b/tests/tests/python/push.yaml
@@ -3,7 +3,7 @@
   hosts: localhost
   serial: 1
   vars:
-    git_files: "python{{ python_version }}/"
+    git_files: "python/"
   tasks:
   - ansible.builtin.include_tasks: ../../tasks/git-init.yaml
   - ansible.builtin.include_tasks: ../../tasks/git-add-commit-push.yaml

diff --git a/tests/tests/ssh-legacy.yaml b/tests/tests/ssh-legacy.yaml
@@ -12,7 +12,6 @@
 - ansible.builtin.import_playbook: features/remote-ssh-legacy.yaml
   vars:
     testname: "REMOTE SSH LEGACY {{ cluster_type|upper }}"
-    node_version: 16
     git_repo_name: features.git
     project: ci-ssh-legacy-{{ cluster_type }}
     branch: remoteshell