From fd17c219388c18217eb8c36f56d609578749fab1 Mon Sep 17 00:00:00 2001 From: amanda Date: Tue, 11 Jan 2022 18:52:45 +0000 Subject: [PATCH 1/2] Add files for building from Rocky8 --- dist.yml | 2 ++ docker-compose.yml | 4 +-- packagingenv/Dockerfile.template | 4 +-- packagingenv/rockylinux8/Dockerfile | 21 ++++++++++++++ packagingenv/rockylinux8/docker-entrypoint.sh | 18 ++++++++++++ testingenv/Dockerfile.template | 2 +- testingenv/rockylinux8/Dockerfile | 10 +++++++ testingenv/rockylinux8/docker-entrypoint.sh | 28 +++++++++++++++++++ 8 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 packagingenv/rockylinux8/Dockerfile create mode 100755 packagingenv/rockylinux8/docker-entrypoint.sh create mode 100755 testingenv/rockylinux8/Dockerfile create mode 100755 testingenv/rockylinux8/docker-entrypoint.sh diff --git a/dist.yml b/dist.yml index 0c8e52f..64f5b2e 100644 --- a/dist.yml +++ b/dist.yml @@ -2,6 +2,8 @@ fedora: - !regexp fedora([0-9.]+) centos: - !regexp centos([0-9.]+) +rockylinux: + - !regexp rockylinux([0-9.]+) ubuntu: - bionic - focal diff --git a/docker-compose.yml b/docker-compose.yml index 43d542c..d24c2fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ focal: service: suite el8: - build: ./packagingenv/centos8 + build: ./packagingenv/rockylinux8 extends: file: docker-compose.override.yml service: suite @@ -37,7 +37,7 @@ focal-test: service: suite-test el8-test: - build: ./testingenv/centos8 + build: ./testingenv/rockylinux8 extends: file: docker-compose.override.yml service: suite-test diff --git a/packagingenv/Dockerfile.template b/packagingenv/Dockerfile.template index 5ef9f88..d40f509 100755 --- a/packagingenv/Dockerfile.template +++ b/packagingenv/Dockerfile.template @@ -1,13 +1,13 @@ FROM {{ dist }}:{{ version }} -{% if dist in ('centos', 'fedora') -%} +{% if dist in ('centos', 'fedora', 'rockylinux') -%} RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools # Add NodeSource repo RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - -{%- if version in ('centos8') %} +{%- if version in ('centos8', 'rockylinux8') %} # Install development tools RUN yum -y module install nodejs:10 diff --git a/packagingenv/rockylinux8/Dockerfile b/packagingenv/rockylinux8/Dockerfile new file mode 100644 index 0000000..d96bfde --- /dev/null +++ b/packagingenv/rockylinux8/Dockerfile @@ -0,0 +1,21 @@ +FROM rockylinux:8 + +RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools + +# Add NodeSource repo +RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - + +# Install development tools +RUN yum -y module install nodejs:10 + +# 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" ] diff --git a/packagingenv/rockylinux8/docker-entrypoint.sh b/packagingenv/rockylinux8/docker-entrypoint.sh new file mode 100755 index 0000000..7745d54 --- /dev/null +++ b/packagingenv/rockylinux8/docker-entrypoint.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -eu +set -o pipefail + +operation="${1:-build}" + +case "$operation" in +pull) + ;; +build) + rpmbuild -bb rpm/st2chatops.spec + cp ../*.rpm $ARTIFACT_DIR + ;; +*) + [[ $# -gt 0 ]] && exec "$@" + ;; +esac diff --git a/testingenv/Dockerfile.template b/testingenv/Dockerfile.template index 94a7681..cfe14da 100644 --- a/testingenv/Dockerfile.template +++ b/testingenv/Dockerfile.template @@ -1,6 +1,6 @@ FROM {{ dist }}:{{ version }} -{% if dist in ('centos', 'fedora') -%} +{% if dist in ('centos', 'fedora', 'rockylinux') -%} # Add NodeSource repo RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - diff --git a/testingenv/rockylinux8/Dockerfile b/testingenv/rockylinux8/Dockerfile new file mode 100755 index 0000000..426db9a --- /dev/null +++ b/testingenv/rockylinux8/Dockerfile @@ -0,0 +1,10 @@ +FROM rockylinux:8 + +# Add NodeSource repo +RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - + +# Install development tools +RUN yum -y install nodejs + +COPY docker-entrypoint.sh /entrypoint.sh +ENTRYPOINT [ "/entrypoint.sh" ] diff --git a/testingenv/rockylinux8/docker-entrypoint.sh b/testingenv/rockylinux8/docker-entrypoint.sh new file mode 100755 index 0000000..a4fdaf1 --- /dev/null +++ b/testingenv/rockylinux8/docker-entrypoint.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -eu +set -o pipefail + +operation="${1:-test}" + +case "$operation" in +pull) + ;; +test) + yum install -y $ARTIFACT_DIR/*.rpm + cd /opt/stackstorm/chatops + sed -i.bak -r "s/^# (export HUBOT_ADAPTER=slack)/\1/" st2chatops.env + sed -i.bak -r "s/^# (export HUBOT_SLACK_TOKEN.).*/\1$SLACK_TOKEN/" st2chatops.env + sed -i.bak -r "s/^(export ST2_AUTH_USERNAME.).*/\1$ST2_USERNAME/" st2chatops.env + sed -i.bak -r "s/^(export ST2_AUTH_PASSWORD.).*/\1$ST2_PASSWORD/" st2chatops.env + bin/hubot &> /tmp/hubot.log & + sleep 15 + cat /tmp/hubot.log + grep -rq "INFO Connected to Slack RTM" /tmp/hubot.log && \ + grep -rq "INFO [[:digit:]]\+ commands are loaded" /tmp/hubot.log + exit $? + ;; +*) + [[ $# -gt 0 ]] && exec "$@" + ;; +esac From ed0af3d73dbaa5a9c6902f3dec0ae796c0c85d9d Mon Sep 17 00:00:00 2001 From: amanda Date: Fri, 21 Jan 2022 16:53:30 +0000 Subject: [PATCH 2/2] Remove centos8 docker containers --- packagingenv/centos8/Dockerfile | 21 ----------------- packagingenv/centos8/docker-entrypoint.sh | 18 --------------- testingenv/centos8/Dockerfile | 10 -------- testingenv/centos8/docker-entrypoint.sh | 28 ----------------------- update.py | 4 ++-- 5 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 packagingenv/centos8/Dockerfile delete mode 100755 packagingenv/centos8/docker-entrypoint.sh delete mode 100755 testingenv/centos8/Dockerfile delete mode 100755 testingenv/centos8/docker-entrypoint.sh diff --git a/packagingenv/centos8/Dockerfile b/packagingenv/centos8/Dockerfile deleted file mode 100644 index b740c03..0000000 --- a/packagingenv/centos8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM centos:8 - -RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools - -# Add NodeSource repo -RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - - -# Install development tools -RUN yum -y module install nodejs:10 - -# 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" ] diff --git a/packagingenv/centos8/docker-entrypoint.sh b/packagingenv/centos8/docker-entrypoint.sh deleted file mode 100755 index 7745d54..0000000 --- a/packagingenv/centos8/docker-entrypoint.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -operation="${1:-build}" - -case "$operation" in -pull) - ;; -build) - rpmbuild -bb rpm/st2chatops.spec - cp ../*.rpm $ARTIFACT_DIR - ;; -*) - [[ $# -gt 0 ]] && exec "$@" - ;; -esac diff --git a/testingenv/centos8/Dockerfile b/testingenv/centos8/Dockerfile deleted file mode 100755 index f4c6dc1..0000000 --- a/testingenv/centos8/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM centos:8 - -# Add NodeSource repo -RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - - -# Install development tools -RUN yum -y install nodejs - -COPY docker-entrypoint.sh /entrypoint.sh -ENTRYPOINT [ "/entrypoint.sh" ] diff --git a/testingenv/centos8/docker-entrypoint.sh b/testingenv/centos8/docker-entrypoint.sh deleted file mode 100755 index a4fdaf1..0000000 --- a/testingenv/centos8/docker-entrypoint.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -operation="${1:-test}" - -case "$operation" in -pull) - ;; -test) - yum install -y $ARTIFACT_DIR/*.rpm - cd /opt/stackstorm/chatops - sed -i.bak -r "s/^# (export HUBOT_ADAPTER=slack)/\1/" st2chatops.env - sed -i.bak -r "s/^# (export HUBOT_SLACK_TOKEN.).*/\1$SLACK_TOKEN/" st2chatops.env - sed -i.bak -r "s/^(export ST2_AUTH_USERNAME.).*/\1$ST2_USERNAME/" st2chatops.env - sed -i.bak -r "s/^(export ST2_AUTH_PASSWORD.).*/\1$ST2_PASSWORD/" st2chatops.env - bin/hubot &> /tmp/hubot.log & - sleep 15 - cat /tmp/hubot.log - grep -rq "INFO Connected to Slack RTM" /tmp/hubot.log && \ - grep -rq "INFO [[:digit:]]\+ commands are loaded" /tmp/hubot.log - exit $? - ;; -*) - [[ $# -gt 0 ]] && exec "$@" - ;; -esac diff --git a/update.py b/update.py index 3dae20e..091bd11 100644 --- a/update.py +++ b/update.py @@ -9,8 +9,8 @@ :Example: - cd packagingenv/centos8 - python ../ centos8 + cd packagingenv/rockylinux8 + python ../ rockylinux8 """ import argparse