Fix deprecated ansible.builtin.include

In new ansible  ansible.builtin.include has been removed.

Change-Id: I5af42d95553247d1bf76fc0b29fa4bdd9998954a

tools/gate/roles/build-images/tasks/airship-shipyard.yaml

@@ -1,105 +0,0 @@
-# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Debug tag generation inputs
-  block:
-    - debug:
-        var: publish
-    - debug:
-        var: distro
-    - debug:
-        var: tags
-    - debug:
-        var: zuul
-    - debug:
-        msg: "{{ tags | to_json }}"
-
-- name: Determine tags
-  shell: echo '{{ tags | to_json }}' | python3 {{ zuul.project.src_dir }}/tools/image_tags.py
-  environment:
-    BRANCH: "{{ zuul.branch | default('') }}"
-    CHANGE: "{{ zuul.change | default('') }}"
-    COMMIT: "{{ zuul.newrev | default('') }}"
-    PATCHSET: "{{ zuul.patchset | default('') }}"
-  register: image_tags
-
-- name: Debug computed tags
-  debug:
-    var: image_tags
-
-- name: Install Docker python module for ansible docker login
-  block:
-    - pip:
-        name: docker
-        executable: pip3
-  become: True
-
-
-- name: Make and run images - verbosive
-  when: not publish
-  shell: |
-        make run_images
-  args:
-    chdir: "{{ zuul.project.src_dir }}"
-    executable: /bin/bash
-  become: True
-
-
-
-- name: Make images
-  when: not publish
-  block:
-    - make:
-        chdir: "{{ zuul.project.src_dir }}"
-        target: images
-        params:
-          IMAGE_TAG: "{{ item }}"
-          DISTRO: "{{ distro }}"
-      with_items: "{{ image_tags.stdout_lines }}"
-
-    - shell: "docker images"
-      register: docker_images
-
-    - debug:
-        var: docker_images
-
-  become: True
-
-- name: Publish images
-  block:
-    - docker_login:
-        username: "{{ airship_shipyard_quay_creds.username }}"
-        password: "{{ airship_shipyard_quay_creds.password }}"
-        registry_url: "https://quay.io/api/v1/"
-
-    - make:
-        chdir: "{{ zuul.project.src_dir }}"
-        target: images
-        params:
-          DOCKER_REGISTRY: "quay.io"
-          IMAGE_PREFIX: "airshipit"
-          IMAGE_TAG: "{{ item }}"
-          COMMIT: "{{ zuul.newrev | default('') }}"
-          PUSH_IMAGE: "true"
-          DISTRO: "{{ distro }}"
-      with_items: "{{ image_tags.stdout_lines }}"
-
-    - shell: "docker images"
-      register: docker_images
-
-    - debug:
-        var: docker_images
-
-  when: publish
-  become: True

tools/gate/roles/build-images/tasks/main.yaml

@@ -12,4 +12,94 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: airship-shipyard.yaml
+- name: Debug tag generation inputs
+  block:
+    - debug:
+        var: publish
+    - debug:
+        var: distro
+    - debug:
+        var: tags
+    - debug:
+        var: zuul
+    - debug:
+        msg: "{{ tags | to_json }}"
+
+- name: Determine tags
+  shell: echo '{{ tags | to_json }}' | python3 {{ zuul.project.src_dir }}/tools/image_tags.py
+  environment:
+    BRANCH: "{{ zuul.branch | default('') }}"
+    CHANGE: "{{ zuul.change | default('') }}"
+    COMMIT: "{{ zuul.newrev | default('') }}"
+    PATCHSET: "{{ zuul.patchset | default('') }}"
+  register: image_tags
+
+- name: Debug computed tags
+  debug:
+    var: image_tags
+
+- name: Install Docker python module for ansible docker login
+  block:
+    - pip:
+        name: docker
+        executable: pip3
+  become: True
+
+
+- name: Make and run images - verbosive
+  when: not publish
+  shell: |
+        make run_images
+  args:
+    chdir: "{{ zuul.project.src_dir }}"
+    executable: /bin/bash
+  become: True
+
+
+
+- name: Make images
+  when: not publish
+  block:
+    - make:
+        chdir: "{{ zuul.project.src_dir }}"
+        target: images
+        params:
+          IMAGE_TAG: "{{ item }}"
+          DISTRO: "{{ distro }}"
+      with_items: "{{ image_tags.stdout_lines }}"
+
+    - shell: "docker images"
+      register: docker_images
+
+    - debug:
+        var: docker_images
+
+  become: True
+
+- name: Publish images
+  block:
+    - docker_login:
+        username: "{{ airship_shipyard_quay_creds.username }}"
+        password: "{{ airship_shipyard_quay_creds.password }}"
+        registry_url: "https://quay.io/api/v1/"
+
+    - make:
+        chdir: "{{ zuul.project.src_dir }}"
+        target: images
+        params:
+          DOCKER_REGISTRY: "quay.io"
+          IMAGE_PREFIX: "airshipit"
+          IMAGE_TAG: "{{ item }}"
+          COMMIT: "{{ zuul.newrev | default('') }}"
+          PUSH_IMAGE: "true"
+          DISTRO: "{{ distro }}"
+      with_items: "{{ image_tags.stdout_lines }}"
+
+    - shell: "docker images"
+      register: docker_images
+
+    - debug:
+        var: docker_images
+
+  when: publish
+  become: True

tools/gate/roles/disable-systemd-resolved/tasks/disable-systemd-resolved.yaml

@@ -1,37 +0,0 @@
-# Copyright 2020 AT&T Intellectual Property.  All other rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Disable systemd-resolved service
-  systemd:
-    state: stopped
-    enabled: no
-    masked: yes
-    daemon_reload: yes
-    name: systemd-resolved
-  become: yes
-
-- name: Remove local stub dns from resolv.conf, if it exists
-  lineinfile:
-    path: /etc/resolv.conf
-    state: absent
-    regexp: '^nameserver.*127.0.0.1'
-  become: yes
-
-- name: Add upstream nameservers in resolv.conf
-  blockinfile:
-    path: /etc/resolv.conf
-    block: |
-      nameserver 8.8.8.8
-      nameserver 8.8.4.4
-  become: yes

tools/gate/roles/disable-systemd-resolved/tasks/main.yaml

@@ -12,4 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: disable-systemd-resolved.yaml
+- name: Disable systemd-resolved service
+  systemd:
+    state: stopped
+    enabled: no
+    masked: yes
+    daemon_reload: yes
+    name: systemd-resolved
+  become: yes
+
+- name: Remove local stub dns from resolv.conf, if it exists
+  lineinfile:
+    path: /etc/resolv.conf
+    state: absent
+    regexp: '^nameserver.*127.0.0.1'
+  become: yes
+
+- name: Add upstream nameservers in resolv.conf
+  blockinfile:
+    path: /etc/resolv.conf
+    block: |
+      nameserver 8.8.8.8
+      nameserver 8.8.4.4
+  become: yes