Replace slave but node in all files

It breaks compatibility as slave is no longer read. Signed-off-by: Cédric Ollivier <[email protected]>
collivier · Jun 2, 2023 · 18dad06 · 18dad06
1 parent 75d7367
commit 18dad06
Show file tree

Hide file tree

Showing 18 changed files with 137 additions and 205 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -6,13 +6,12 @@ ipaddress: "{{ ansible_default_ipv4.address }}"
 external_ipaddress: "{{ ipaddress }}"
 project: xtesting
 db_project: "{{ project }}"
-use_slave:  # true if slaves are deployed
+use_node:  # true if runners/agents are deployed
 user_mail: root@localhost
 
 kubernetes_deploy: false
 kubernetes_recreate: false
 use_kubernetes: "{{ kubernetes_deploy }}"
-use_node: "{{ use_kubernetes }}"
 
 # testcases
 repo: opnfv
@@ -21,7 +20,7 @@ docker_tags:
   - latest:
       branch: master
       dependency: '3.13'
-      # slave: lf-build2
+      # node: lf-build2
 docker_args:
   env: {}
   volumes: []
@@ -215,8 +214,8 @@ http_dst_url: http://{{ external_ipaddress }}:{{ s3www_port }}
 push_to_db: true
 mongo_deploy: true
 mongo_port: 27017
-mongo_url: mongodb://{{ ipaddress }}:{{ mongo_port }}
 mongo_wait: 1
+mongo_url: mongodb://{{ ipaddress }}:{{ mongo_port }}
 node_name: '{{ project }}'
 
 # testapi

diff --git a/templates/gitlab-ci.jobs.yml.j2 b/templates/gitlab-ci.jobs.yml.j2
@@ -42,7 +42,7 @@
 {% for volume in docker_args.volumes %}
     - mkdir -p {{ volume.split(':').1 |dirname }} && cp -f {{ volume.split(':').0 |basename }} {{ volume.split(':').1 }}
 {% endfor %}
-{% elif use_kubernetes and not use_slave %}
+{% elif use_kubernetes and not use_node %}
 .{{ project}}_config: &{{ project}}_config
   before_script:
 {% for volume in docker_args.volumes %}
@@ -55,7 +55,7 @@
 {{ test }}:
   only:
     - schedules
-{% if use_slave %}
+{% if use_node %}
   tags:
     - {{ project }}-daily
 {% endif %}
@@ -65,7 +65,7 @@
   {% else %}
 
   {% endif -%}
-  {% if use_artifacts or (use_kubernetes and not use_slave) %}<<: [*{{ project}}_variables,*{{ project}}_config]
+  {% if use_artifacts or (use_kubernetes and not use_node) %}<<: [*{{ project}}_variables,*{{ project}}_config]
   {% else %}<<: *{{ project}}_variables
   {% endif -%}
   {% if suite.timeout is defined %}timeout: {{ suite.timeout }}
@@ -80,7 +80,7 @@
 zip:
   only:
     - schedules
-{% if use_slave %}
+{% if use_node %}
   tags:
     - {{ project }}-daily
 {% endif %}

diff --git a/templates/gitlab-ci.yml.j2 b/templates/gitlab-ci.yml.j2
@@ -33,7 +33,7 @@ stages:
 {% for volume in docker_args.volumes %}
     - mkdir -p {{ volume.split(':').1 |dirname }} && cp -f {{ volume.split(':').0 |basename }} {{ volume.split(':').1 }}
 {% endfor %}
-{% elif use_kubernetes and not use_slave %}
+{% elif use_kubernetes and not use_node %}
 .{{ project}}_config: &{{ project}}_config
   before_script:
 {% for volume in docker_args.volumes %}
@@ -52,7 +52,7 @@ stages:
 {{ test }}:
   only:
     - schedules
-{% if use_slave %}
+{% if use_node %}
   tags:
     - {{ project }}-daily
 {% endif %}
@@ -62,7 +62,7 @@ stages:
   {% else %}
 
   {% endif -%}
-  {% if use_artifacts or gitlab_use_chainedci or (use_kubernetes and not use_slave) %}<<: *{{ project}}_config
+  {% if use_artifacts or gitlab_use_chainedci or (use_kubernetes and not use_node) %}<<: *{{ project}}_config
   {% endif -%}
   {% if suite.timeout is defined %}timeout: {{ suite.timeout }}
   {% endif -%}
@@ -76,7 +76,7 @@ stages:
 zip:
   only:
     - schedules
-{% if use_slave %}
+{% if use_node %}
   tags:
     - {{ project }}-daily
 {% endif %}