Improve parsers/redhat_release to detect CentOS correctly

.coveragerc

@@ -4,8 +4,6 @@ omit = insights/contrib/*
        insights/*/__main__.py
        # Exclude test files from coverage.
        insights/tests/*
-       insights/parsers/tests/*
-       insights/combiners/tests/*
 branch = True
 
 [report]

.flake8

@@ -1,3 +1,3 @@
 [flake8]
-ignore = E501,E126,E127,E128,E722,E741
-exclude = insights/contrib,bin,docs,include,lib,lib64,.git,.collections.py
+ignore = E501,E126,E127,E128,E722,E741,W605,W504
+exclude = insights/contrib,bin,docs,include,lib,lib64,.git,.collections.py,insights/parsers/tests/lvm_test_data.py,insights/client/apps/ansible/playbook_verifier/contrib

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+### All Pull Requests:
+
+Check all that apply:
+
+* [ ] Have you followed the guidelines in our Contributing document, including the instructions about commit messages?
+* [ ] Is this PR to correct an issue?
+* [ ] Is this PR an enhancement?
+
+### Complete Description of Additions/Changes:
+
+<!--
+Provide complete details of the issue or enhancement. You may link to existing open publicly-accessible issues or enhancement requests that provide these details.
+
+Please do not include links to any websites that are not publicly accessible. You may include non-link reference numbers to help you and your team identify non-public references. 
+
+This information is necessary before your PR can be reviewed.
+
+You may remove this comment.
+-->
+*Add your description here*

.github/workflows/main.yml

@@ -0,0 +1,138 @@
+name: Insights Core Test
+
+on:
+  push:
+    branches: [ master, '3.0']
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  code-test:
+
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-versions: [3.6, 3.9]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-versions }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-versions }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+    - name: flake8
+      run: |
+        pip install -e .[linting]
+        flake8 .
+    - name: pytest
+      run: |
+        pip install 'urllib3<2'
+        pip install -e .[testing]
+        pytest
+
+  python27-test:
+
+    runs-on: ubuntu-latest
+    container:
+      image: python:2.7.18-buster
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 2.7
+      uses: actions/setup-python@v4
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+    - name: flake8
+      run: |
+        pip install -e .[linting]
+        flake8 .
+    - name: pytest
+      run: |
+        pip install 'urllib3<2'
+        pip install -e .[testing]
+        pytest
+
+  python26-test:
+
+    runs-on: ubuntu-latest
+    container: ubuntu:18.04
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install sudo package
+      run: apt update && apt install sudo
+    - name: install dependencies
+      run: |
+        sudo apt-get install -y --no-install-recommends software-properties-common
+        sudo apt-get install -y --no-install-recommends libssl1.0-dev zlib1g-dev
+        sudo apt-get install -y build-essential git curl unzip file wget tar
+    - name: build python26
+      run: |
+        CUR_DIR=$(pwd)
+        cd ../
+        wget https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tgz
+        tar zxf ./Python-2.6.9.tgz
+        sed -e "s:'\/usr\/lib64',:'\/usr\/lib64', '\/usr\/lib/x86_64-linux-gnu',:" ./Python-2.6.9/setup.py -i
+        mkdir ./Python-2.6.9/build && cd ./Python-2.6.9/build
+        ../configure --prefix=$HOME/python26 && make && make install
+        sudo update-alternatives --install /usr/bin/python python $HOME/python26/bin/python2.6 1
+        sudo update-alternatives --set python $HOME/python26/bin/python2.6
+        cd ${CUR_DIR}
+    - name: build setuptools and pip
+      run: |
+        export PATH=$PATH:/github/home/.local/bin
+        CUR_DIR=$(pwd)
+        mkdir ../tools && cd ../tools
+        curl -L -O https://files.pythonhosted.org/packages/b8/04/be569e393006fa9a2c10ef72ea33133c2902baa115dd1d4279dae55c3b3b/setuptools-36.8.0.zip
+        unzip setuptools-36.8.0.zip && cd setuptools-36.8.0
+        python setup.py install --user && cd ..
+        curl -L -O https://github.com/pypa/pip/archive/refs/tags/9.0.3.tar.gz
+        tar -xvzf 9.0.3.tar.gz && cd pip-9.0.3
+        python setup.py install --user
+        cd ${CUR_DIR}
+    - name: get depenencies
+      run: |
+        export PATH=$PATH:/github/home/.local/bin
+        CUR_DIR=$(pwd)
+        cd ../
+        git clone https://github.com/SteveHNH/jenkins-s2i-example.git pips
+        (cd ./pips/slave26/pip_packages && test -f coverage-4.3.4-cp26-cp26mu-manylinux1_x86_64.whl && mv coverage-4.3.4-cp26-cp26mu-manylinux1_x86_64.whl coverage-4.3.4-py2.py3-none-any.whl)
+        pip install --user --no-index -f ./pips/slave26/pip_packages -r ./pips/slave26/ci_requirements.txt
+        cd ${CUR_DIR}
+        mkdir ../collections_module
+        sudo curl -L -o ./../collections_module/collections.py https://raw.githubusercontent.com/RedHatInsights/insights-core/5c8ca0f2fb3de45908e8d931d40758af34a7997a/.collections.py
+    - name: flake8
+      run: |
+        export PATH=$PATH:/github/home/.local/bin
+        pip install --user -e .[linting] -f ./pips/slave26/pip_packages
+        flake8 .
+    - name: pytest
+      run: |
+        export PATH=$PATH:/github/home/.local/bin
+        pip install --user -e .[testing] -f ./pips/slave26/pip_packages
+        export PYTHONPATH=${PYTHONPATH}:./../collections_module
+        pytest
+
+  docs-test:
+
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.8
+    - name: install dependencies
+      run: |
+        sudo apt-get install pandoc
+        python -m pip install --upgrade pip
+    - name: docs Test
+      run: |
+        pip install docutils==0.17
+        pip install -e .[docs]
+        sphinx-build -W -b html -qa -E docs docs/_build/html

.gitignore

@@ -25,6 +25,7 @@ pylint.out
 cover/
 docs/plugin_catalog/*.rst
 docs/components.rst
+docs/specs_catalog.rst
 build/
 .idea*
 dist/
@@ -48,4 +49,8 @@ share/
 .Python
 .python*
 .pytest_cache
-.vscode
+.vscode
+insights/filters.yaml
+.nox/
+.venv/
+

.tito/packages/.readme

@@ -0,0 +1,3 @@
+the .tito/packages directory contains metadata files
+named after their packages. Each file has the latest tagged
+version and the project's relative directory.

.tito/tito.props

@@ -0,0 +1,9 @@
+[buildconfig]
+builder = tito.builder.Builder
+tagger = tito.tagger.VersionTagger
+changelog_do_not_remove_cherrypick = 0
+changelog_format = %s (%ae)
+tag_format = {component}-{version}
+[version_template]
+template_file = ./.tito/version_template_file
+destination_file = ./insights/VERSION

.tito/version_template_file

@@ -0,0 +1 @@
+$version

CONTRIBUTING.md

@@ -16,24 +16,24 @@ phase).
 
 ## Rule Development Setup
 
-Clone the project::
+Clone the project:
 
     git clone [email protected]:RedHatInsights/insights-core.git
 
-Or, alternatively, using HTTPS::
+Or, alternatively, using HTTPS:
 
     git clone https://github.com/RedHatInsights/insights-core.git
 
-Initialize a virtualenv::
+Initialize a virtualenv:
 
     cd insights-core
     virtualenv .
 
-Install the project and its dependencies::
+Install the project and its dependencies:
 
     bin/pip install -e .
 
-Install a rule repository::
+Install a rule repository:
 
     bin/pip install -e path/to/rule/repo
 
@@ -42,16 +42,16 @@ Install a rule repository::
 
 If you wish to contribute to the insights-core project you'll need to create a fork in github.
 
-1. Clone your fork::
+1. Clone your fork:
 
     git clone [email protected]:your-user/insights-core.git
 
-2. Reference the original project as "upstream"::
+2. Reference the original project as "upstream":
 
     git remote add upstream [email protected]:RedHatInsights/insights-core.git
 
 At this point, you would synchronize your fork with the upstream project
-using the following commands::
+using the following commands:
 
     git pull upstream master
     git push origin master
@@ -133,7 +133,11 @@ from the current master branch of the upstream project.
    of the topic branch.  Again, such manipulations change history and
    require a `--force` push.
 
-6. When ready, use the github UI to submit a pull request.
+6. When ready, use the github UI to submit a pull request.  Fill out
+   the information requested in the PR template.  If your PR fixes an
+   issue make sure to reference the issue using a
+   [keyword](https://docs.github.com/en/issues/tracking-your-work-with-issues/creating-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)
+   so that it will be closed once your PR is merged.
 
 7. Repeat steps 4 and 5 as necessary.  Note that a forced push to the
    topic branch will work as expected.  The pull request will be

Dockerfile

@@ -1,5 +1,5 @@
 FROM centos:7
 RUN yum install -y python-devel file zip gcc libffi-devel && yum clean all
-RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python get-pip.py && rm get-pip.py
+RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py && python get-pip.py && rm get-pip.py
 COPY . /src
 RUN pip install /src

Jenkinsfile

@@ -21,18 +21,18 @@ pipeline {
             sh """
                 virtualenv .testenv
                 source .testenv/bin/activate
-                pip install "idna<=2.7"
-                pip install "pycparser<=2.18"
-                pip install -e .[testing]
+                pip install /pip_packages/pip-9.0.3-py2.py3-none-any.whl
+                pip install -r /var/lib/jenkins/ci_requirements.txt -f /pip_packages
+                pip install -e .[testing] -f /pip_packages
                 pytest
             """
             echo "Testing with Linter..."
             sh """
                 virtualenv .lintenv
                 source .lintenv/bin/activate
-                pip install "idna<=2.7"
-                pip install "pycparser<=2.18"
-                pip install -e .[linting]
+                pip install /pip_packages/pip-9.0.3-py2.py3-none-any.whl
+                pip install -r /var/lib/jenkins/ci_requirements.txt -f /pip_packages
+                pip install -e .[linting] -f /pip_packages
                 flake8
             """
           }
@@ -69,14 +69,14 @@ pipeline {
           steps {
             echo "Testing with Pytest..."
             sh """
-                /bin/python36 -m venv .testenv
+                /bin/python3 -m venv .testenv
                 source .testenv/bin/activate
                 pip install -e .[testing]
                 pytest
             """
             echo "Testing with Linter..."
             sh """
-                /bin/python36 -m venv .lintenv
+                /bin/python3 -m venv .lintenv
                 source .lintenv/bin/activate
                 pip install -e .[linting]
                 flake8
@@ -99,7 +99,7 @@ pipeline {
       steps {
         echo "Building Docs..."
         sh """
-            /bin/python36 -m venv .docenv
+            /bin/python3 -m venv .docenv
             source .docenv/bin/activate
             pip install -e .[docs]
             sphinx-build -W -b html -qa -E docs docs/_build/html

MANIFEST.in.client

@@ -1,4 +1,6 @@
 include insights/defaults.yaml
+include insights/revoked_playbooks.yaml
+include insights/compliance_obfuscations.yaml
 include insights/NAME
 include insights/VERSION
 include insights/COMMIT

MANIFEST.in.core

@@ -0,0 +1,17 @@
+include insights/defaults.yaml
+include insights/NAME
+include insights/VERSION
+include insights/COMMIT
+include insights/RELEASE
+prune examples
+prune insights/client
+prune insights/combiners/tests
+prune insights/components/tests
+prune insights/parsers/tests
+prune insights/parsr/tests
+prune insights/plugins
+prune insights/parsr/examples/tests
+prune insights/parsr/query/tests
+prune insights/tests
+include insights/parsers/__init__.py
+include insights/combiners/__init__.py

build_core_rpm.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+PYTHON=${1:-python}
+
+rm -rf BUILD BUILDROOT RPMS SRPMS
+rm -rf insights_core.egg-info
+cp MANIFEST.in.core MANIFEST.in
+$PYTHON setup.py sdist
+rpmbuild -ba -D "_topdir $PWD" -D "_sourcedir $PWD/dist" insights-core.spec
+rm -rf dist BUILD BUILDROOT
+git checkout MANIFEST.in