Skip to content
Snippets Groups Projects
Unverified Commit 1bfb7ceb authored by Imran Iqbal's avatar Imran Iqbal Committed by GitHub
Browse files

Merge pull request #72 from myii/feat/restructure-to-work-for-all-platforms 

feat: restructure to work for all platforms
parents 56520008 ad867bb7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 9
− 9
View file @ 1bfb7ceb
...@@ -140,21 +140,21 @@ default-debian-10-master-py3: {extends: '.test_instance'} ...@@ -140,21 +140,21 @@ default-debian-10-master-py3: {extends: '.test_instance'}
default-debian-9-master-py3: {extends: '.test_instance'} default-debian-9-master-py3: {extends: '.test_instance'}
default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-ubuntu-2004-master-py3: {extends: '.test_instance'}
default-ubuntu-1804-master-py3: {extends: '.test_instance'} default-ubuntu-1804-master-py3: {extends: '.test_instance'}
# default-centos-8-master-py3: {extends: '.test_instance'} default-centos-8-master-py3: {extends: '.test_instance'}
default-centos-7-master-py3: {extends: '.test_instance'} default-centos-7-master-py3: {extends: '.test_instance'}
default-fedora-34-master-py3: {extends: '.test_instance'} default-fedora-34-master-py3: {extends: '.test_instance'}
default-fedora-33-master-py3: {extends: '.test_instance'} default-fedora-33-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-153-master-py3: {extends: '.test_instance'} default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'} default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
default-amazonlinux-2-master-py3: {extends: '.test_instance'} default-amazonlinux-2-master-py3: {extends: '.test_instance'}
# default-oraclelinux-8-master-py3: {extends: '.test_instance'} default-oraclelinux-8-master-py3: {extends: '.test_instance'}
# default-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-oraclelinux-7-master-py3: {extends: '.test_instance'}
# default-arch-base-latest-master-py3: {extends: '.test_instance'} default-arch-base-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'} # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'} default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# default-almalinux-8-master-py3: {extends: '.test_instance'} default-almalinux-8-master-py3: {extends: '.test_instance'}
# default-rockylinux-8-master-py3: {extends: '.test_instance'} default-rockylinux-8-master-py3: {extends: '.test_instance'}
# default-debian-11-3003-3-py3: {extends: '.test_instance'} # default-debian-11-3003-3-py3: {extends: '.test_instance'}
# default-debian-10-3003-3-py3: {extends: '.test_instance'} # default-debian-10-3003-3-py3: {extends: '.test_instance'}
# default-debian-9-3003-3-py3: {extends: '.test_instance'} # default-debian-9-3003-3-py3: {extends: '.test_instance'}
......
.travis.yml
+ 9
− 9
View file @ 1bfb7ceb
...@@ -100,21 +100,21 @@ jobs: ...@@ -100,21 +100,21 @@ jobs:
- env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-debian-9-master-py3
- env: INSTANCE=default-ubuntu-2004-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3
- env: INSTANCE=default-ubuntu-1804-master-py3 - env: INSTANCE=default-ubuntu-1804-master-py3
# - env: INSTANCE=default-centos-8-master-py3 - env: INSTANCE=default-centos-8-master-py3
- env: INSTANCE=default-centos-7-master-py3 - env: INSTANCE=default-centos-7-master-py3
- env: INSTANCE=default-fedora-34-master-py3 - env: INSTANCE=default-fedora-34-master-py3
- env: INSTANCE=default-fedora-33-master-py3 - env: INSTANCE=default-fedora-33-master-py3
# - env: INSTANCE=default-opensuse-leap-153-master-py3 - env: INSTANCE=default-opensuse-leap-153-master-py3
# - env: INSTANCE=default-opensuse-leap-152-master-py3 - env: INSTANCE=default-opensuse-leap-152-master-py3
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
- env: INSTANCE=default-amazonlinux-2-master-py3 - env: INSTANCE=default-amazonlinux-2-master-py3
# - env: INSTANCE=default-oraclelinux-8-master-py3 - env: INSTANCE=default-oraclelinux-8-master-py3
# - env: INSTANCE=default-oraclelinux-7-master-py3 # - env: INSTANCE=default-oraclelinux-7-master-py3
# - env: INSTANCE=default-arch-base-latest-master-py3 - env: INSTANCE=default-arch-base-latest-master-py3
# - env: INSTANCE=default-gentoo-stage3-latest-master-py3 # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
# - env: INSTANCE=default-gentoo-stage3-systemd-master-py3 - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
# - env: INSTANCE=default-almalinux-8-master-py3 - env: INSTANCE=default-almalinux-8-master-py3
# - env: INSTANCE=default-rockylinux-8-master-py3 - env: INSTANCE=default-rockylinux-8-master-py3
# - env: INSTANCE=default-debian-11-3003-3-py3 # - env: INSTANCE=default-debian-11-3003-3-py3
# - env: INSTANCE=default-debian-10-3003-3-py3 # - env: INSTANCE=default-debian-10-3003-3-py3
# - env: INSTANCE=default-debian-9-3003-3-py3 # - env: INSTANCE=default-debian-9-3003-3-py3
......
systemd/defaults.yaml
+ 1
− 1
View file @ 1bfb7ceb
...@@ -25,7 +25,7 @@ systemd: ...@@ -25,7 +25,7 @@ systemd:
fileattr: {} fileattr: {}
path: /etc/systemd/network path: /etc/systemd/network
service: systemd-networkd service: systemd-networkd
wait_online: true wait_online: false
resolved: resolved:
config_source: file config_source: file
......
systemd/networkd/init.sls
+ 6
− 2
View file @ 1bfb7ceb
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
{%- from "systemd/libtofs.jinja" import files_switch with context -%} {%- from "systemd/libtofs.jinja" import files_switch with context -%}
{%- set networkd = systemd.get('networkd', {}) %} {%- set networkd = systemd.get('networkd', {}) %}
{%- set service_wait_online = 'systemd-networkd-wait-online' %}
networkd: networkd:
{%- if networkd.pkg %} {%- if networkd.pkg %}
...@@ -31,8 +32,11 @@ networkd: ...@@ -31,8 +32,11 @@ networkd:
- enable: True - enable: True
{%- if networkd.wait_online %} {%- if networkd.wait_online %}
wait_online-service-enabled:
service.enabled:
- name: {{ service_wait_online }}
wait_online: wait_online:
service.running: service.running:
- name: systemd-networkd-wait-online - name: {{ service_wait_online }}
- enable: True
{%- endif %} {%- endif %}
systemd/osfamilymap.yaml
+ 8
− 4
View file @ 1bfb7ceb
...@@ -11,7 +11,6 @@ Debian: ...@@ -11,7 +11,6 @@ Debian:
pkgs_libs: pkgs_libs:
- libsystemd0 - libsystemd0
pkgs_extra: pkgs_extra:
- python-systemd
- python3-systemd - python3-systemd
resolved: resolved:
pkg: libnss-resolve pkg: libnss-resolve
...@@ -21,9 +20,8 @@ RedHat: ...@@ -21,9 +20,8 @@ RedHat:
pkgs_libs: pkgs_libs:
- systemd-libs - systemd-libs
pkgs_extra: pkgs_extra:
- systemd-python - python3-systemd
resolved: resolved:
pkg: systemd-resolved
resolv_target: /run/systemd/resolve/resolv.conf resolv_target: /run/systemd/resolve/resolv.conf
networkd: networkd:
pkg: systemd-networkd pkg: systemd-networkd
...@@ -33,7 +31,6 @@ Arch: ...@@ -33,7 +31,6 @@ Arch:
- systemd-libs - systemd-libs
pkgs_extra: pkgs_extra:
- python-systemd - python-systemd
- python2-systemd
resolved: resolved:
resolv_target: /run/systemd/resolve/stub-resolv.conf resolv_target: /run/systemd/resolve/stub-resolv.conf
...@@ -42,5 +39,12 @@ Suse: ...@@ -42,5 +39,12 @@ Suse:
- libsystemd0 - libsystemd0
pkgs_extra: pkgs_extra:
- util-linux-systemd - util-linux-systemd
networkd:
pkg: systemd-network
resolved: resolved:
pkg: nss-resolve pkg: nss-resolve
Gentoo:
pkg: sys-apps/systemd
pkgs_extra:
- dev-python/python-systemd
systemd/osfingermap.yaml
+ 17
− 30
View file @ 1bfb7ceb
...@@ -7,39 +7,26 @@ ...@@ -7,39 +7,26 @@
# Only add an `osfinger` which is/will be supported by the formula # Only add an `osfinger` which is/will be supported by the formula
# (empty `osfinger`s do not need to be listed, just added here as an example). # (empty `osfinger`s do not need to be listed, just added here as an example).
--- ---
Debian-11: # os_family/os: Debian/Debian
pkgs_extra: Debian-9:
- python3-systemd
# TODO: Return back to this and check if the following two lines can be removed,
# in order to use the setting in `defaults.yaml` instead (i.e. `true`).
# Using it for this initial phase of introducing pre-release Bullseye CI
# testing; the `systemd-networkd-wait-online` service doesn't start.
networkd: networkd:
wait_online: false wait_online: true
Ubuntu-20.04: # os_family/os: RedHat/CentOS
CentOS Linux-7:
pkgs_extra: pkgs_extra:
- python3-systemd - systemd-python
Ubuntu-18.04: {} networkd:
wait_online: true
CentOS Stream-8: # os_family/os: RedHat/Amazon
pkgs_lib: Amazon Linux-2:
- systemd-libs
pkgs_extra: pkgs_extra:
- python3-systemd - systemd-python
resolved:
pkg: {}
CentOS Linux-8:
pkgs_lib:
- systemd-libs
pkgs_extra:
- python3-systemd
resolved:
pkg: {}
Fedora-33:
networkd: networkd:
pkg: systemd-networkd wait_online: true
Fedora-34:
networkd: # os_family/os: RedHat/OEL
pkg: systemd-networkd Oracle Linux Server-7:
pkgs_extra:
- systemd-python
systemd/osmap.yaml
+ 0
− 7
View file @ 1bfb7ceb
...@@ -9,12 +9,5 @@ ...@@ -9,12 +9,5 @@
--- ---
# os_family: RedHat # os_family: RedHat
Fedora: Fedora:
pkgs_libs:
- systemd-libs
pkgs_extra:
- python3-systemd
networkd: networkd:
networkctl_reload: true networkctl_reload: true
pkg: {}
resolved:
pkg: {}
test/salt/states/rsync_test_package/init.sls
+ 1
− 1
View file @ 1bfb7ceb
rsync_test_package: rsync_test_package:
pkg.installed: pkg.installed:
- name: rsync - name: {{ 'net-misc/rsync' if grains.os_family == 'Gentoo' else 'rsync' }}
rsync_test_file: rsync_test_file:
file.managed: file.managed:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment