Commit 018ff95f authored by nanahira's avatar nanahira

fix fish of centos 8

parent 33366aa1
Pipeline #1012 failed with stage
in 3 minutes and 21 seconds
......@@ -10,7 +10,7 @@ before_script:
- ssh-keygen -q -t rsa -N '' -f ~/.ssh/id_rsa <<<y 2>&1 >/dev/null
- cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
- pip3 install -U pip -i https://mirrors.aliyun.com/pypi/simple/
- pip install -U ansible -i https://mirrors.aliyun.com/pypi/simple/
- pip install -U ansible==2.9 -i https://mirrors.aliyun.com/pypi/simple/
- ansible --version
- wget -O - https://minio.mycard.moe:9000/nanahira/mitogen-0.2.9.tar.gz | tar zxvf -
- cp tests/ansible.cfg .
......
......@@ -3,10 +3,19 @@
dnf:
name: epel-release
when: ansible_distribution != 'Fedora'
- name: fish yum repo
become: true
yum_repository:
name: fish
description: fish
baseurl: 'https://download.opensuse.org/repositories/shells:/fish:/release:/3/CentOS_8/'
ip_resolve: 'IPv4'
gpgkey: 'https://download.opensuse.org/repositories/shells:/fish:/release:/3/CentOS_8/repodata/repomd.xml.key'
when: ansible_os_family == "RedHat" and ansible_distribution_major_version|int == 8
- name: dnf
become: true
dnf:
name: curl,wget,git,vim,sudo,byobu,iftop,iotop,gcc,gcc-c++,make,autoconf,p7zip,p7zip-plugins,python3-pip,python3-devel,tcpdump,rsync,htop,mtr,net-tools,ctags,astyle,xclip,traceroute,tar,unzip,nmap,python3-libselinux,mosh,subversion,haveged,nfs-utils,ipset # nfs-common,fish
name: curl,wget,git,vim,sudo,byobu,iftop,iotop,gcc,gcc-c++,make,autoconf,p7zip,p7zip-plugins,python3-pip,python3-devel,tcpdump,rsync,htop,mtr,net-tools,ctags,astyle,xclip,traceroute,tar,unzip,nmap,python3-libselinux,mosh,subversion,haveged,nfs-utils,ipset,fish # nfs-common,fish
update_cache: yes
- name: Fedora packages
become: true
......
......@@ -43,7 +43,7 @@
when: install_docker
- name: fish
include_tasks: fish.yml
when: customization and ansible_os_family == 'Debian' or ansible_distribution == 'Fedora' # RedHat has too many problems on fish, so aborted
when: customization and (ansible_os_family == 'Debian' or ansible_distribution == 'Fedora' or ansible_os_family == 'RedHat' and ansible_distribution_major_version|int == 8)
- name: customize
include_tasks: '{{item}}.yml'
with_items:
......
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