Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ commands:

setup_ubuntu:
steps:
- run: apt-get update && apt-get install -y curl sudo
- run: apt-get update && apt-get install -y curl sudo python3
- setup_common
- run: cp test/utils/systemctl.py /bin/systemctl
- run: cp test/utils/systemctl.py /bin/systemd
- setup_common

setup_centos:
steps:
- run: yum -y update
- run: yum install -y curl sudo
- run: yum install -y curl sudo python3
- setup_common
- run: cp test/utils/systemctl.py /usr/bin/systemctl
- run: cp test/utils/systemctl.py /usr/bin/systemd
- setup_common

install:
steps:
Expand All @@ -46,7 +46,7 @@ commands:
type: string
default: "apt"
steps:
- run: python test/utils/check_<<parameters.repo_type>>_install.py --major-version <<parameters.version>>
- run: python3 test/utils/check_<<parameters.repo_type>>_install.py --major-version <<parameters.version>>

uninstall:
steps:
Expand All @@ -59,12 +59,12 @@ commands:
type: string
default: "apt"
steps:
- run: python test/utils/check_<<parameters.repo_type>>_install.py --not-installed
- run: python3 test/utils/check_<<parameters.repo_type>>_install.py --not-installed

jobs:
agent7_ubuntu:
docker:
- image: ubuntu:bionic-20191202
- image: ubuntu:focal
steps:
- checkout
- setup_installed_version:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

agent6_ubuntu:
docker:
- image: ubuntu:bionic-20191202
- image: ubuntu:focal
steps:
- checkout
- setup_installed_version:
Expand Down
2 changes: 1 addition & 1 deletion test/utils/check_apt_install.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import apt, re, sys
from helpers import get_options, check_major_version, check_install_info
Expand Down
2 changes: 1 addition & 1 deletion test/utils/check_yum_install.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import yum, sys
from helpers import get_options, check_major_version, check_install_info
Expand Down
2 changes: 1 addition & 1 deletion test/utils/systemctl.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/env python3
from __future__ import print_function

__copyright__ = "(C) 2016-2019 Guido U. Draheim, licensed under the EUPL"
Expand Down