VOL-5352 - AWS AMI Recreation testing
.pre-commit-config.yaml
.gitignore
requirements.txt
-----------------------
- Install module pre-commit for repository linting.
- Copy in config file to initially support manual linting.
Makefilea
VERSION
makefiles/virtualenv.mk
lf/transition.mk
------------------------
- Add bridge logic to begin using repo:onf-make library makefiles.
makefiles/virtualenv.mk
-----------------------
- Install requirements.txt modules using --no-cachedir.
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I086f2a075a026e5b36711a633e39176d4f16b0f0
diff --git a/.gitignore b/.gitignore
index d7e76d7..63b5618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
# python virtualenv
vst_venv
-.venv
+.venv/
bin/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..5d27c40
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,187 @@
+---
+
+# -----------------------------------------------------------------------
+# [NOTE] - Propogate .pre-commit-config.yaml edits to all repositories!
+# -----------------------------------------------------------------------
+# [NOTE] - Common config file source lives in repo:onf-make
+# - https://gerrit.opencord.org/plugins/gitiles/
+# onf-make/+/refs/heads/master/.pre-commit-config.yaml
+# -----------------------------------------------------------------------
+# [TODO]
+# - pre-commit yaml config exists individually within repositories.
+# - Generally lint config and benavior is consistent for all repos.
+# - Exclusions and bulk cleanup necessitate per-repo custom configs.
+# - Dynamically generate this config file from common and custom
+# -----------------------------------------------------------------------
+
+# -----------------------------------------------------------------------
+# Copyright 2024 Open Networking Foundation Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+# SPDX-FileCopyrightText: 2024 Open Networking Foundation Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+# -----------------------------------------------------------------------
+# .pre-commit-config-yaml v0.6
+# -----------------------------------------------------------------------
+
+# ci:
+# autofix_commit_msg: "Chore: pre-commit autoupdate"
+## skip: [sync]
+# skip:
+# # pre-commit.ci does not have actionlint installed
+# - actionlint
+#
+# exclude: '^docs/conf.py'
+
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v4.5.0
+ hooks:
+ - id: trailing-whitespace
+ - id: check-added-large-files
+ - id: check-ast
+ - id: check-json
+ - id: check-merge-conflict
+ - id: check-xml
+ - id: check-yaml
+ # - id: debug-statements
+ - id: end-of-file-fixer
+ - id: fix-encoding-pragma
+ # - id: double-quote-string-fixer
+ - id: requirements-txt-fixer
+ - id: mixed-line-ending
+ args: ['--fix=lf']
+
+ - repo: https://github.com/jorisroovers/gitlint
+ rev: acc9d9de6369b76d22cb4167029d2035e8730b98 # frozen: v0.19.1
+ hooks:
+ - id: gitlint
+
+ - repo: https://github.com/koalaman/shellcheck-precommit
+ rev: v0.10.0
+ hooks:
+ - id: shellcheck
+
+ - repo: https://github.com/adrienverge/yamllint.git
+ rev: v1.35.1
+ hooks:
+ - id: yamllint
+
+ ## -----------------------------------------------------------------------
+ ## [SOURCE] Documentation
+ ## -----------------------------------------------------------------------
+ - repo: https://github.com/rstcheck/rstcheck
+ rev: v6.2.1
+ hooks:
+ - id: rstcheck
+
+ - repo: https://github.com/markdownlint/markdownlint
+ rev: v0.13.0
+ hooks:
+ - id: markdownlint
+ # - id: markdownlint_docker
+
+ ## -----------------------------------------------------------------------
+ ## [SOURCE] Docker
+ ## -----------------------------------------------------------------------
+ - repo: https://github.com/hadolint/hadolint
+ rev: v2.12.0
+ hooks:
+ # - id: hadolint # local tool install
+ - id: hadolint-docker
+
+ ## -----------------------------------------------------------------------
+ ## [SOURCE] Golang
+ ## -----------------------------------------------------------------------
+ - repo: https://github.com/golangci/golangci-lint
+ rev: v1.41.1
+ hooks:
+ - id: golangci-lint
+
+ ## -----------------------------------------------------------------------
+ ## [SOURCE] REUSE License Checking
+ ## -----------------------------------------------------------------------
+ # - repo: https://github.com/fsfe/reuse-tool
+ # rev: v3.0.2
+ # hooks:
+ # - id: reuse
+ # - id: add-license-headers
+
+ # - repo: https://github.com/ansys/pre-commit-hooks
+ # rev: v0.2.9
+ # hooks:
+ # - id: add-license-headers
+ # args:
+ # - --custom_copyright=custom copyright phrase
+ # - --custom_template=template_name
+ # - --custom_license=license_name
+ # - --ignore_license_check
+ # - --start_year=2023
+
+ ## -----------------------------------------------------------------------
+ ## [SOURCE] Python
+ ## -----------------------------------------------------------------------
+ - repo: https://github.com/psf/black
+ rev: 22.10.0
+ hooks:
+ - id: black
+
+ # - repo: https://github.com/PyCQA/doc8
+ # rev: v1.1.1
+ # hooks:
+ # - id: doc8
+
+ ## -----------------------------------------------------------------------
+ ## [SOURCE] Spelling
+ ## -----------------------------------------------------------------------
+ - repo: https://github.com/codespell-project/codespell
+ rev: v2.2.4
+ hooks:
+ - id: codespell
+
+ ## -----------------------------------------------------------------------
+ ## [SOURCE] Testing
+ ## -----------------------------------------------------------------------
+ - repo: https://github.com/MarketSquare/robotframework-tidy
+ rev: 4.11.0
+ hooks:
+ - id: robotidy
+
+# -------------------------------------------------------------------
+# https://docs.python.org/3/library/re.html#regular-expression-syntax
+# -------------------------------------------------------------------
+exclude: |
+ (?x)^(
+ ^makefiles/.* |
+ ^lf/.* |
+ ^.venv/.* |
+ ^.vendor/.* |
+ ^\[END-OF-EXCLUDE\]
+ )$
+
+# [SEE ALSO]
+# -----------------------------------------------------------------------
+# https://github.com/memfault/interrupt/blob/master/example/pre-commit/.pre-commit-config.yaml
+# https://pre-commit.com/hooks.html
+# https://github.com/floatingpurr/sync_with_poetry/blob/main/.pre-commit-config.yaml
+# https://github.com/the-common/pre-commit-config-template/blob/master/.pre-commit-config.yaml
+# https://github.com/memfault/interrupt/blob/master/example/pre-commit/.pre-commit-config.yaml
+# -----------------------------------------------------------------------
+# https://www.hatica.io/blog/pre-commit-git-hooks/
+# -----------------------------------------------------------------------
+
+# [EOF]
diff --git a/VERSION b/VERSION
index f92b44a..4287bc3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.0-dev
+2.13.0-dev1
diff --git a/docker/Dockerfile.voltctl b/docker/Dockerfile.voltctl
index ee73986..7528c08 100644
--- a/docker/Dockerfile.voltctl
+++ b/docker/Dockerfile.voltctl
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM busybox:1.31.1-glibc
+FROM busybox:stable-glibc
RUN mkdir -p /usr/bin
@@ -25,11 +25,11 @@
# https://github.com/opencord/voltctl/releases
# - offers v1.9.1 (latest released via build + tagging).
# -------------------------------------------------------------------
-# RUN wget -O - https://github.com/opencord/voltctl/releases/download/v1.9.1/voltctl-1.9.1-linux-amd64
+# RUN wget -O - https://github.com/opencord/voltctl/releases/download/v1.9.1/voltctl-1.9.1-linux-amd64
# https://github.com/opencord/voltctl/releases/download/untagged-cd611c39178f25b95a87/voltctl-1.9.1-linux-amd64
-RUN wget -q\
+RUN wget -q --no-check-certificate\
-O /usr/bin/voltctl.tmp\
https://github.com/opencord/voltctl/releases/download/v1.8.45/voltctl-1.8.45-linux-amd64
diff --git a/lf/transition.mk b/lf/transition.mk
new file mode 100644
index 0000000..b8dbb9e
--- /dev/null
+++ b/lf/transition.mk
@@ -0,0 +1,70 @@
+# -*- makefile -*-
+# -----------------------------------------------------------------------
+# Copyright 2024 Open Networking Foundation Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------
+# SPDX-FileCopyrightText: 2024 Open Networking Foundation Contributors
+# SPDX-License-Identifier: Apache-2.0
+# -----------------------------------------------------------------------
+
+$(if $(DEBUG),$(warning ENTER))
+
+##-------------------##
+##---] GLOBALS [---##
+##-------------------##
+lf-sbx-root := $(abspath $(lastword $(MAKEFILE_LIST)))
+lf-sbx-root := $(subst /lf/transition.mk,$(null),$(lf-sbx-root))
+
+legacy-mk ?= $(lf-sbx-root)/makefiles
+onf-mk-dir ?= $(lf-sbx-root)/lf/onf-make/makefiles
+
+sandbox-root := $(lf-sbx-root)
+
+## -----------------------------------------------------------------------
+## Intent: on-demand submodule checkout when make targets are invoked
+## -----------------------------------------------------------------------
+GIT ?= /usr/bin/env git
+
+git-submodule-deps += $(onf-mk-dir)/consts.mk
+git-submodule-deps += $(onf-mk-dir)/etc/features.mk # $(call banner-enter)
+git-submodule-deps += $(onf-mk-dir)/virtualenv/include.mk # make venv
+git-submodule-deps += $(onf-mk-dir)/commands/pre-commit/include.mk
+
+# git-submodule-deps : $(git-submodule-deps)
+
+$(git-submodule-deps) :
+
+ $(call banner-enter,(Checkout git submodules))
+ $(GIT) submodule update --init --recursive
+ $(call banner-leave,(Checkout git submodules))
+
+##--------------------##
+##---] INCLUDES [---##
+##--------------------##
+TOP ?= $(lf-sbx-root)
+
+##--------------------##
+##---] INCLUDES [---##
+##--------------------##
+include $(onf-mk-dir)/consts.mk
+include $(onf-mk-dir)/etc/features.mk # $(call banner-enter)
+include $(onf-mk-dir)/virtualenv/include.mk # make venv
+include $(onf-mk-dir)/commands/pre-commit/include.mk
+
+include $(TOP)/makefiles/include.mk # top level include
+
+# dependency of virtualenv::sterile
+clean ::
+
+# [EOF]
diff --git a/requirements.txt b/requirements.txt
index d492f02..1f0dfaf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,6 +29,7 @@
# https://pypi.org/project/robotframework/#history
# -----------------------------------------------------------------------
robotframework==3.1.2 # 2019-05-24
+# robotframework==6.1.1 # 2019-05-24
robotframework-kafkalibrary==0.0.3
robotframework-lint==1.0
robotframework-requests==0.7.0
@@ -58,4 +59,8 @@
protobuf3-to-dict>=0.1.5
device-management-interface>=1.2.1
+pre-commit
+
+# https://github.com/robotframework/robotframework/tree/v6.1.1#readme
+
# [EOF]