Merge pull request #188 from StackStorm/remove_bionic_el7

Remove bionic and EL7

Author: amanda11

.circleci/config.yml

@@ -7,12 +7,12 @@ version: 2
 jobs:
   build:
     machine:
-      image: "ubuntu-2004:current"
+      image: "ubuntu-2204:2023.04.2"
     working_directory: ~/StackStorm/st2chatops
-    parallelism: 4
+    parallelism: 2
     shell: /bin/bash --login
     environment:
-      DISTROS: bionic focal el7 el8
+      DISTROS: focal el8
       ST2_PACKAGES_REPO: https://github.com/StackStorm/st2-packages
       ST2_TEST_ENVIRONMENT: https://github.com/StackStorm/st2-docker
       DEPLOY_PACKAGES: 1
@@ -38,7 +38,6 @@ jobs:
           docker-compose version
           nodejs -v
           jq --version
-          package_cloud version
     - run:
         name: Ensure Docker running
         command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
@@ -122,7 +121,7 @@ jobs:
       - image: circleci/ruby:2.7
     working_directory: ~/packages
     environment:
-      DISTROS: "bionic focal el7 el8"
+      DISTROS: "focal el8"
     steps:
       - attach_workspace:
           at: /home/circleci

CHANGELOG.rst

@@ -23,6 +23,9 @@ Changed
 
     Contributed by @lopf
 
+* Removed EL7 and bionic
+    Contributed by @amanda11
+
 Removed
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 * Remove skills-validator from npm-shrinkwrap.json

dist.yml

@@ -5,5 +5,4 @@ centos:
 rockylinux:
   - !regexp rockylinux([0-9.]+)
 ubuntu:
-  - bionic
   - focal

docker-compose.yml

@@ -1,10 +1,4 @@
 # Packaging environments
-bionic:
-  build: ./packagingenv/bionic
-  extends:
-    file: docker-compose.override.yml
-    service: suite
-
 focal:
   build: ./packagingenv/focal
   extends:
@@ -17,19 +11,7 @@ el8:
     file: docker-compose.override.yml
     service: suite
 
-el7:
-  build: ./packagingenv/centos7
-  extends:
-    file: docker-compose.override.yml
-    service: suite
-
 # Testing environments
-bionic-test:
-  build: ./testingenv/bionic
-  extends:
-    file: docker-compose.override.yml
-    service: suite-test
-
 focal-test:
   build: ./testingenv/focal
   extends:
@@ -42,8 +24,3 @@ el8-test:
     file: docker-compose.override.yml
     service: suite-test
 
-el7-test:
-  build: ./testingenv/centos7
-  extends:
-    file: docker-compose.override.yml
-    service: suite-test

packagingenv/Dockerfile.template

@@ -30,7 +30,7 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install \
     build-essential curl gnupg devscripts debhelper dh-make git libicu-dev
 
-{%- if version in ('bionic', 'focal') %}
+{%- if version in ('focal') %}
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install dh-systemd
 {% endif %}