[RHELC-857] Remove Centos6 from testing (#698)

.github/renovate.json

@@ -2,18 +2,24 @@
   "extends": [
     "config:base"
   ],
-  "enabledManagers": ["dockerfile", "pip_requirements", "github-actions"],
+  "enabledManagers": [
+    "dockerfile",
+    "pip_requirements",
+    "github-actions"
+  ],
   "ignorePaths": [
-    "**/centos6.Dockerfile",
     "**/centos7.Dockerfile",
     "**/rpmbuild.centos7.Dockerfile",
-    "**/centos6*.requirements.txt"
   ],
   "packageRules": [
     {
-      "matchPackageNames": ["pytest"],
-      "matchFiles": ["requirements/centos8.requirements.txt"],
+      "matchPackageNames": [
+        "pytest"
+      ],
+      "matchFiles": [
+        "requirements/centos8.requirements.txt"
+      ],
       "allowedVersions": "<=7.0"
     }
   ]
-}
+}

.github/workflows/build_images.yml

@@ -9,7 +9,7 @@ jobs:
     name: build-centos${{ matrix.centos_ver }}
     strategy:
       matrix:
-        centos_ver: [6, 7, 8]
+        centos_ver: [7, 8]
 
     permissions:
       contents: read

.github/workflows/coverage.yml

@@ -11,7 +11,7 @@ jobs:
     name: coverage-centos${{ matrix.centos_ver }}
     strategy:
       matrix:
-        centos_ver: [6, 7, 8]
+        centos_ver: [7, 8]
 
     runs-on: ubuntu-20.04
     steps:

.github/workflows/release.yml

@@ -6,30 +6,6 @@ on:
     types: [published]
 
 jobs:
-  build_el6_rpm:
-    name: Build EL6 RPM
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Build RPM package for EL6
-        id: rpm_build_el6
-        uses: bocekm/rpmbuild@el6
-        with:
-          spec_path: "packaging/convert2rhel.spec"
-
-      - name: Upload EL6 RPM as release asset
-        id: upload_release_asset_el6
-        uses: actions/upload-release-asset@v1
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-            upload_url: ${{ github.event.release.upload_url }}
-            asset_path: ${{ steps.rpm_build_el6.outputs.rpm_path }}
-            asset_name: ${{ steps.rpm_build_el6.outputs.rpm_name }}
-            asset_content_type: ${{ steps.rpm_build_el6.outputs.content_type }}
-
   build_el7_rpm:
     name: Build EL7 RPM
     runs-on: ubuntu-latest

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        centos_ver: [6, 7, 8]
+        centos_ver: [7, 8]
 
     runs-on: ubuntu-20.04
     steps:

Makefile

@@ -96,15 +96,12 @@ endif
 	@echo "or login first with '$(DOCKER) login ghcr.io -u $$github_username'"
 	@echo "https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-to-the-container-registry"
 	@echo
-	@echo "Pulling $(IMAGE)-centos6"
-	@$(DOCKER) pull $(IMAGE)-centos6
 	@echo "Pulling $(IMAGE)-centos7"
 	@$(DOCKER) pull $(IMAGE)-centos7
 	@echo "Pulling $(IMAGE)-centos8"
 	@$(DOCKER) pull $(IMAGE)-centos8
 .build-images:
 	@echo "Building images"
-	@$(DOCKER) build -f Dockerfiles/centos6.Dockerfile -t $(IMAGE)-centos6 .
 	@$(DOCKER) build -f Dockerfiles/centos7.Dockerfile -t $(IMAGE)-centos7 .
 	@$(DOCKER) build -f Dockerfiles/centos8.Dockerfile -t $(IMAGE)-centos8 .
 	touch $@
@@ -115,19 +112,12 @@ lint: images
 lint-errors: images
 	@$(DOCKER) run $(DOCKER_RM_CONTAINER) -v $(shell pwd):/data:Z $(IMAGE)-centos8 bash -c "scripts/run_lint.sh --errors-only"
 
-tests: tests6 tests7 tests8
+tests: tests7 tests8
 
 # These files need to be made writable for pytest to run
 WRITABLE_FILES=. .coverage coverage.xml
 DOCKER_TEST_FUNC=echo $(DOCKER_TEST_WARNING) ; $(DOCKER) run -v $(shell pwd):/data:Z --name pytest-container -u root:root $(DOCKER_RM_CONTAINER) $(IMAGE)-$(1) /bin/sh -c 'touch $(WRITABLE_FILES) ; chown app:app $(WRITABLE_FILES) ; su app -c "pytest $(2) $(PYTEST_ARGS)"' ; DOCKER_RETURN=$${?} ; $(DOCKER_CLEANUP) ; exit $${DOCKER_RETURN}
 
-tests6: images
-	@echo 'CentOS Linux 6 tests'
-ifneq ("$(SHOW_CAPTURE)", "no")
-		@$(call DOCKER_TEST_FUNC,centos6,--show-capture=$(SHOW_CAPTURE))
-else
-		@$(call DOCKER_TEST_FUNC,centos6,)
-endif
 
 tests7: images
 	@echo 'CentOS Linux 7 tests'