CI: Remove ci-man jobs from JJB, change GHA WF
The previous GHA workflow did not include voting, so this switches to
one that does.
Packer jobs will remain in JJB for now, as they are not yet properly
implemented for AWS-based Jenkins clouds. The merge job also remains
in place for now, though it will be replaced once GHA jobs are
functioning correctly.
This also includes some yamllint fixes to .pre-commit-config.yaml.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: Ife44a2cfed9c5a5bc4ca8a2ac3f38f9a95210d8d
diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml
index e89c2e6..01b7dfd 100644
--- a/.github/workflows/gerrit-verify.yaml
+++ b/.github/workflows/gerrit-verify.yaml
@@ -52,7 +52,7 @@
jobs:
call-composed-ci-man-verify:
# yamllint disable-line rule:line-length
- uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-compose-ci-management-verify.yaml@cfe55838e3aac24c19b250029ba9d4f503c54fc6
+ uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-verify.yaml@cfe55838e3aac24c19b250029ba9d4f503c54fc6
with:
GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }}
GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fb93a96..6798de4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,25 +3,25 @@
# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
+ - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- - id: trailing-whitespace
- - id: end-of-file-fixer
- - id: check-yaml
- - id: check-added-large-files
-- repo: https://github.com/psf/black
+ - id: trailing-whitespace
+ - id: end-of-file-fixer
+ - id: check-yaml
+ - id: check-added-large-files
+ - repo: https://github.com/psf/black
rev: 22.10.0
hooks:
- - id: black
-- repo: https://github.com/koalaman/shellcheck-precommit
+ - id: black
+ - repo: https://github.com/koalaman/shellcheck-precommit
rev: v0.10.0
hooks:
- - id: shellcheck
-- repo: https://github.com/adrienverge/yamllint.git
+ - id: shellcheck
+ - repo: https://github.com/adrienverge/yamllint.git
rev: v1.35.1
hooks:
- - id: yamllint
+ - id: yamllint
# -------------------------------------------------------------------
# https://docs.python.org/3/library/re.html#regular-expression-syntax
@@ -38,25 +38,3 @@
^.venv/.* |
^jjb/pipeline/voltha/voltha-physical-soak-dt-tests.groovy
)$
-
-
-# -----------------------------------------------------------------------
-# declare -a args=()
-# args+=('--color=always')
-#
-# if true; then
-# args+=('--all-files')
-# else
-# args+=('--files' 'jjb/pipeline/voltha/voltha-physical-soak-dt-tests.groovy')
-# fi
-#
-# freeze
-# args+=('--bleeding-edge')
-# args+=('--freeze')
-#
-# args+=('--show-diff-on-failure')
-#
-# pre-commit run "${args[@]}" &1 | tee log
-# -----------------------------------------------------------------------
-
-# [EOF]
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index bcb089e..16980a6 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -6,7 +6,7 @@
build-node: 'ubuntu18.04-basebuild-1c-1g'
jobs:
- - '{project-name}-ci-jobs'
+ - gerrit-jjb-merge
name: ci-management-jobs
project: 'ci-management'