dev env CentOS 7 /Suse: add snmp testing support

also update to current standard
rsyslog · Dec 3, 2019 · fc8de02 · fc8de02
1 parent 8640340
commit fc8de02
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/dev_env/centos/base/7/Dockerfile b/dev_env/centos/base/7/Dockerfile
@@ -48,6 +48,7 @@ RUN	yum -y update && \
 	python-devel \
 	python-docutils \
 	python-sphinx \
+	python-pysnmp \
 	qpid-proton-c-devel \
 	redhat-rpm-config \
 	snappy-devel \
@@ -218,6 +219,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-pmsnare \
 	--enable-relp \
 	--enable-snmp \
+	--enable-snmp-tests \
 	--enable-usertools \
 	--enable-valgrind \
 	\

diff --git a/dev_env/suse/base/tumbleweed/Dockerfile b/dev_env/suse/base/tumbleweed/Dockerfile
@@ -46,6 +46,7 @@ RUN	zypper --non-interactive install \
 	python-devel \
 	python-docutils \
 	python-sphinx \
+	python3-pysnmp \
 	qpid-proton \
 	qpid-proton-devel \
 	systemd-devel \
@@ -269,6 +270,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-pmsnare \
 	--enable-relp \
 	--enable-snmp \
+	--enable-snmp-tests \
 	--enable-usertools \
 	--enable-valgrind \
 	--enable-gssapi-krb5 \
@@ -284,5 +286,8 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 # module needs fixes:
 #	--enable-mmgrok
 #	   -> we cannot build, libtokyocabinet dependency is not available as well
+ENV	PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib64/pkgconfig/
 WORKDIR /rsyslog
+ARG	BUILD_TIME
+ENV	CONTAINER_BUILD_TIME=$BUILD_TIME
 USER rsyslog
diff --git a/dev_env/suse/base/tumbleweed/build.sh b/dev_env/suse/base/tumbleweed/build.sh
@@ -1,12 +1,11 @@
 set -e
-docker build $1 -t rsyslog/rsyslog_dev_base_suse:tumbleweed .
+docker build $1 --build-arg BUILD_TIME="$(date)" -t rsyslog/rsyslog_dev_base_suse:tumbleweed .
 printf "\n\n================== BUILD DONE, NOW TESTING CONTAINER:"
-docker run -ti rsyslog/rsyslog_dev_base_suse:tumbleweed bash -c  "
+docker run -ti --rm rsyslog/rsyslog_dev_base_suse:tumbleweed bash -c  "
 set -e && \
 git clone https://github.com/rsyslog/rsyslog.git && \
 cd rsyslog && \
-autoreconf -fi && \
-./configure \$RSYSLOG_CONFIGURE_OPTIONS --enable-compile-warnings=yes  && \
+devtools/run-configure.sh
 make -j4
 "
 if [ $? -eq 0 ]; then

diff --git a/dev_env/suse/buildbot/tumbleweed/tag-previous.sh b/dev_env/suse/buildbot/tumbleweed/tag-previous.sh
@@ -1,2 +1,4 @@
 docker tag rsyslog/rsyslog_dev_buildbot_suse:tumbleweed rsyslog/rsyslog_dev_buildbot_suse:tumbleweed_previous
 docker push rsyslog/rsyslog_dev_buildbot_suse:tumbleweed_previous
+#revert
+#docker tag rsyslog/rsyslog_dev_buildbot_suse:tumbleweed_previous rsyslog/rsyslog_dev_buildbot_suse:tumbleweed