|
 |
4e5dbe2 |
From 7e69bf2647d3450e4b6da9f5caaa65664443745f Mon Sep 17 00:00:00 2001
|
|
|
4e5dbe2 |
From: Adam Williamson <awilliam@redhat.com>
|
|
|
4e5dbe2 |
Date: Thu, 25 Jan 2024 08:44:09 -0800
|
|
|
4e5dbe2 |
Subject: [PATCH 20/21] CI: use sudo, assume docker is present, always pass
|
|
|
4e5dbe2 |
lint
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
Huh. I kinda just assumed we'd be root. Guess not!
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
All my attempts to just get a 'docker' binary installed seem
|
|
|
4e5dbe2 |
to be failing on conflicts. Maybe it's already there in the
|
|
|
4e5dbe2 |
GHA image? Let's try leaving it out.
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
pylint and flake8 exit non-zero if a single issue is found, and
|
|
|
4e5dbe2 |
right now we have tons of them. For now just to get started,
|
|
|
4e5dbe2 |
let's make them only informational. I can send a follow-up PR
|
|
|
4e5dbe2 |
to use diff-cover, maybe, to only fail on *new* violations.
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
|
4e5dbe2 |
---
|
|
|
4e5dbe2 |
.github/workflows/ci.yml | 14 +++++++-------
|
|
|
4e5dbe2 |
Makefile | 4 ++--
|
|
|
4e5dbe2 |
2 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
|
|
|
4e5dbe2 |
index 4fcd212..9c8f59a 100644
|
|
|
4e5dbe2 |
--- a/.github/workflows/ci.yml
|
|
|
4e5dbe2 |
+++ b/.github/workflows/ci.yml
|
|
|
4e5dbe2 |
@@ -11,10 +11,10 @@ jobs:
|
|
|
4e5dbe2 |
uses: actions/checkout@v4
|
|
|
4e5dbe2 |
with:
|
|
|
4e5dbe2 |
fetch-depth: 0
|
|
|
4e5dbe2 |
- - name: Install make and docker
|
|
|
4e5dbe2 |
- run: apt-get install make docker docker.io
|
|
|
4e5dbe2 |
+ - name: Install make
|
|
|
4e5dbe2 |
+ run: sudo apt-get install make
|
|
|
4e5dbe2 |
- name: Run the tests
|
|
|
4e5dbe2 |
- run: make container-unittests-fedora
|
|
|
4e5dbe2 |
+ run: sudo make container-unittests-fedora
|
|
|
4e5dbe2 |
unittests-el7:
|
|
|
4e5dbe2 |
runs-on: ubuntu-latest
|
|
|
4e5dbe2 |
steps:
|
|
|
4e5dbe2 |
@@ -22,10 +22,10 @@ jobs:
|
|
|
4e5dbe2 |
uses: actions/checkout@v4
|
|
|
4e5dbe2 |
with:
|
|
|
4e5dbe2 |
fetch-depth: 0
|
|
|
4e5dbe2 |
- - name: Install make and docker
|
|
|
4e5dbe2 |
- run: apt-get install make docker
|
|
|
4e5dbe2 |
+ - name: Install make
|
|
|
4e5dbe2 |
+ run: sudo apt-get install make
|
|
|
4e5dbe2 |
- name: Run the tests
|
|
|
4e5dbe2 |
- run: make container-unittests-el7
|
|
|
4e5dbe2 |
+ run: sudo make container-unittests-el7
|
|
|
4e5dbe2 |
lint:
|
|
|
4e5dbe2 |
runs-on: ubuntu-latest
|
|
|
4e5dbe2 |
steps:
|
|
|
4e5dbe2 |
@@ -34,7 +34,7 @@ jobs:
|
|
|
4e5dbe2 |
with:
|
|
|
4e5dbe2 |
fetch-depth: 0
|
|
|
4e5dbe2 |
- name: Install make, pylint and flake8
|
|
|
4e5dbe2 |
- run: apt-get install make pylint flake8
|
|
|
4e5dbe2 |
+ run: sudo apt-get install make pylint flake8
|
|
|
4e5dbe2 |
- name: Run pylint
|
|
|
4e5dbe2 |
run: make pylint
|
|
|
4e5dbe2 |
- name: Run flake8
|
|
|
4e5dbe2 |
diff --git a/Makefile b/Makefile
|
|
|
4e5dbe2 |
index 74d3d99..2940289 100644
|
|
|
4e5dbe2 |
--- a/Makefile
|
|
|
4e5dbe2 |
+++ b/Makefile
|
|
|
4e5dbe2 |
@@ -64,10 +64,10 @@ test-coverage:
|
|
|
4e5dbe2 |
xdg-open htmlcov/index.html
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
pylint:
|
|
|
4e5dbe2 |
- pylint --rcfile=pylint.conf oz oz-install oz-customize oz-cleanup-cache oz-generate-icicle
|
|
|
4e5dbe2 |
+ pylint --rcfile=pylint.conf oz oz-install oz-customize oz-cleanup-cache oz-generate-icicle || :
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
flake8:
|
|
|
4e5dbe2 |
- flake8 --ignore=E501 oz
|
|
|
4e5dbe2 |
+ flake8 --ignore=E501 oz || :
|
|
|
4e5dbe2 |
|
|
|
4e5dbe2 |
container-clean:
|
|
|
4e5dbe2 |
docker rm -f oz-tests-fedora
|
|
|
4e5dbe2 |
--
|
|
|
4e5dbe2 |
2.43.0
|
|
|
4e5dbe2 |
|