Remove bionic/el7 and add el9

.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: 3
     shell: /bin/bash --login
     environment:
-      DISTROS: bionic focal el7 el8
+      DISTROS: focal el8 el9
       ST2_PACKAGES_REPO: https://github.com/StackStorm/st2-packages
       ST2_TEST_ENVIRONMENT: https://github.com/StackStorm/st2-docker
       DEPLOY_PACKAGES: 1
@@ -38,13 +38,12 @@ 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; '
-    - run:
-        name: Set up Ruby 2.0
-        command: rvm use ruby-2.0.0-p645 --default
+   # - run:
+   #     name: Set up Ruby 2.0
+   #     command: rvm use ruby-2.0.0-p645 --default
     - run:
         name: Get PackageCloud variables
         command: |
@@ -122,7 +121,7 @@ jobs:
       - image: circleci/ruby:2.7
     working_directory: ~/packages
     environment:
-      DISTROS: "bionic focal el7 el8"
+      DISTROS: "focal el8 el9"
     steps:
       - attach_workspace:
           at: /home/circleci

CHANGELOG.rst

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

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,13 @@ el8:
     file: docker-compose.override.yml
     service: suite
 
-el7:
-  build: ./packagingenv/centos7
+el9:
+  build: ./packagingenv/rockylinux9
   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 +30,8 @@ el8-test:
     file: docker-compose.override.yml
     service: suite-test
 
-el7-test:
-  build: ./testingenv/centos7
+el9-test:
+  build: ./testingenv/rockylinux9
   extends:
     file: docker-compose.override.yml
     service: suite-test

packagingenv/rockylinux9/Dockerfile

@@ -0,0 +1,21 @@
+FROM rockylinux:9
+
+RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools
+
+# Add NodeSource repo
+#RUN curl --silent --location https://rpm.nodesource.com/setup_18.x | bash -
+
+# Install development tools
+RUN yum -y module install nodejs:18
+#
+# Install python3 for gyp
+RUN yum -y install python3
+
+# Upgrade gyp to a python3 compatible version
+RUN npm install -g node-gyp@latest
+
+# Install development tools
+RUN yum -y install nodejs
+
+COPY docker-entrypoint.sh /entrypoint.sh
+ENTRYPOINT [ "/entrypoint.sh" ]

testingenv/centos7/Dockerfile → testingenv/rockylinux9/Dockerfile

@@ -1,4 +1,4 @@
-FROM centos:7
+FROM rockylinux:9
 
 # Add NodeSource repo
 RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash -