This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch lint in repository https://gitbox.apache.org/repos/asf/skywalking-terraform.git
commit 21f68577dec82e9c2f2f7d3993257a502ecd8d31 Author: kezhenxu94 <[email protected]> AuthorDate: Thu Oct 26 17:05:20 2023 +0800 ci: add linter for ansible playbook and disable dependentbot --- .asf.yaml | 1 + .github/workflows/license.yml | 8 ++++--- ansible/roles/install-java/tasks/main.yml | 6 ++--- ansible/roles/skywalking/tasks/main.yml | 39 +++++++++++++++---------------- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 8402555..dbd8411 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -22,6 +22,7 @@ github: - skywalking - terraform - ansible + dependabot_updates: false enabled_merge_buttons: squash: true merge: false diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 6a0dfe6..bddf3cf 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: License +name: CI on: push: @@ -22,8 +22,8 @@ on: pull_request: jobs: - license: - name: license + ci: + name: ci runs-on: ubuntu-latest steps: - name: Checkout @@ -34,3 +34,5 @@ jobs: uses: apache/skywalking-eyes/header/@d299844e334855087f18ae1fe3c81ae8d22bc282 with: config: .licenserc.yaml + - name: Lint Ansible Playbook + uses: ansible/[email protected] diff --git a/ansible/roles/install-java/tasks/main.yml b/ansible/roles/install-java/tasks/main.yml index c65e2d5..3d874ab 100644 --- a/ansible/roles/install-java/tasks/main.yml +++ b/ansible/roles/install-java/tasks/main.yml @@ -15,19 +15,19 @@ --- - name: Install Java 11 on RHEL-based systems - package: + ansible.builtin.package: name: java-11-openjdk state: present when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' or ansible_distribution == 'Fedora' - name: Install Java 11 on Ubuntu systems - package: + ansible.builtin.package: name: openjdk-11-jdk state: present when: ansible_distribution == 'Ubuntu' - name: Install Java 11 on Amazon distribution - package: + ansible.builtin.package: name: java-11-amazon-corretto state: present when: ansible_distribution == 'Amazon' diff --git a/ansible/roles/skywalking/tasks/main.yml b/ansible/roles/skywalking/tasks/main.yml index 499e6cd..2400abf 100644 --- a/ansible/roles/skywalking/tasks/main.yml +++ b/ansible/roles/skywalking/tasks/main.yml @@ -15,17 +15,17 @@ --- - name: Create and set permissions for skywalking directory - file: + ansible.builtin.file: path: /usr/local/skywalking state: directory - recurse: yes + recurse: true owner: skywalking group: skywalking mode: "0755" - name: Download remote Apache SkyWalking tarball when: skywalking_tarball is match('^https?://.*') - get_url: + ansible.builtin.get_url: url: "{{ skywalking_tarball }}" dest: /usr/local/skywalking/apache-skywalking-apm.tar.gz @@ -39,16 +39,16 @@ mode: '0755' - name: Extract tarball - unarchive: + ansible.builtin.unarchive: src: /usr/local/skywalking/apache-skywalking-apm.tar.gz dest: /usr/local/skywalking - remote_src: yes + remote_src: true owner: skywalking group: skywalking extra_opts: [--strip-components=1] - name: Generate environment file for webui service - template: + ansible.builtin.template: src: skywalking-ui.env.j2 dest: /home/skywalking/webapp.env owner: skywalking @@ -56,7 +56,7 @@ when: inventory_hostname in groups['skywalking_ui'] - name: Generate environment file for OAP service - template: + ansible.builtin.template: src: skywalking-oap.env.j2 dest: /home/skywalking/oap.env owner: skywalking @@ -64,15 +64,15 @@ when: inventory_hostname in groups['skywalking_oap'] - name: Check hostgroup size - set_fact: + ansible.builtin.set_fact: oap_init_node: "{{ (inventory_hostname in groups['skywalking_oap'] and hostvars[inventory_hostname]['database']['type'] == 'h2') | ternary([], [groups['skywalking_oap'][0]]) }}" - name: Run the OAPSericeInit script - command: "sudo -u skywalking -- sh -c 'set -a; source /home/skywalking/oap.env; set +a; /usr/local/skywalking/bin/oapServiceInit.sh'" + ansible.builtin.command: "sudo -u skywalking -- sh -c 'set -a; source /home/skywalking/oap.env; set +a; /usr/local/skywalking/bin/oapServiceInit.sh'" when: inventory_hostname in oap_init_node - name: Generate systemd unit file for oap service - template: + ansible.builtin.template: src: skywalking-oap.service.j2 dest: /usr/lib/systemd/system/skywalking-oap.service owner: root @@ -80,7 +80,7 @@ when: inventory_hostname in groups['skywalking_oap'] - name: Generate systemd unit file for webui service - template: + ansible.builtin.template: src: skywalking-ui.service.j2 dest: /usr/lib/systemd/system/skywalking-ui.service owner: root @@ -88,30 +88,29 @@ when: inventory_hostname in groups['skywalking_ui'] - name: Reload systemd - systemd: - daemon_reload: yes + ansible.builtin.systemd: + daemon_reload: true - name: Link and enable skywalking-oap service - systemd: + ansible.builtin.systemd: name: skywalking-oap - enabled: yes + enabled: true when: inventory_hostname in groups['skywalking_oap'] - name: Link and enable skywalking-ui service - systemd: + ansible.builtin.systemd: name: skywalking-ui - enabled: yes + enabled: true when: inventory_hostname in groups['skywalking_ui'] - name: Start SkyWalking-OAP service - systemd: + ansible.builtin.systemd: name: skywalking-oap state: started when: inventory_hostname in groups['skywalking_oap'] - name: Start SkyWalking-UI service - systemd: + ansible.builtin.systemd: name: skywalking-ui state: started when: inventory_hostname in groups['skywalking_ui'] -
