Commit 7e0b72d5 authored by nanahira's avatar nanahira

fix

parent 0e1ae843
Pipeline #14124 failed with stage
in 5 minutes and 19 seconds
...@@ -12,8 +12,7 @@ variables: ...@@ -12,8 +12,7 @@ variables:
image: debian:buster image: debian:buster
script: script:
- apt update && apt -y install python3-pip tar wget || dnf -y install python3-pip tar wget || yum -y install python3-pip tar wget - apt update && apt -y install python3-pip tar wget || dnf -y install python3-pip tar wget || yum -y install python3-pip tar wget
- pip3 install -U pip -i https://mirrors.aliyun.com/pypi/simple/ - pip3 install -U ansible==2.9 jinja2==3.0 -i https://mirrors.aliyun.com/pypi/simple/
- pip install -U ansible==2.9 jinja2==3.0 -i https://mirrors.aliyun.com/pypi/simple/
- ansible --version - ansible --version
- wget -O - https://minio.mycard.moe:9000/nanahira/mitogen-0.2.9.tar.gz | tar zxvf - - wget -O - https://minio.mycard.moe:9000/nanahira/mitogen-0.2.9.tar.gz | tar zxvf -
- cp tests/ansible.cfg . - cp tests/ansible.cfg .
...@@ -33,10 +32,6 @@ centos7: ...@@ -33,10 +32,6 @@ centos7:
extends: .base extends: .base
image: centos:7 image: centos:7
centos-latest:
extends: .base
image: centos:latest
fedora: fedora:
extends: .base extends: .base
image: fedora:latest image: fedora:latest
...@@ -33,4 +33,3 @@ laptop: false ...@@ -33,4 +33,3 @@ laptop: false
extra_params: [] extra_params: []
nfs: false nfs: false
docker_root: /var/lib/docker docker_root: /var/lib/docker
testing: false
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
become: true become: true
hostname: hostname:
name: "{{ inventory_hostname }}" name: "{{ inventory_hostname }}"
when: inventory_hostname_short != '10' and inventory_hostname_short != '172' and inventory_hostname_short != '192' and not testing when: inventory_hostname_short != '10' and inventory_hostname_short != '172' and inventory_hostname_short != '192' and ansible_virtualization_type != 'docker'
- name: hostname hosts - name: hostname hosts
become: true become: true
blockinfile: blockinfile:
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
allow_password: false allow_password: false
vm_agents_status: present vm_agents_status: present
china_mirror_omf: true china_mirror_omf: true
testing: true
hosts: hosts:
localhost: localhost:
ansible_connection: local ansible_connection: local
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment