Fixes for almalinux9 (#186)

* accept curl-minimal or curl
* Allows [buildtype=fvtbuild]

Jenkinsfile

@@ -123,6 +123,16 @@ pipeline {
                         if (env.BUILD_LABEL == null ) {
                             env.BUILD_LABEL = "${env.BUILD_TIMESTAMP}_eclipse${distro}"
                         }
+			buildtype = sh (returnStdout: true, script: '''
+                            message=`git log -1 --skip=$x --pretty=%B`
+                            if [[ "$message" =~ [[]buildtype=([A-Za-z0-9]+)[]] ]]
+                            then
+                                echo ${BASH_REMATCH[1]}
+                            fi
+			''').trim()
+			if (buildtype != null && buildtype != "") {
+			    env.BUILD_TYPE=buildtype
+			}
                         echo "Welcome"
                     }
                 }
@@ -317,6 +327,7 @@ spec:
                                             if [[ "$BRANCH_NAME" == "$mainBranch" ]] ; then
                                                 export BUILD_TYPE=fvtbuild
                                             fi
+
                                             bash buildcontainer/build.sh
                                             cd ../operator
                                             NOORIGIN_BRANCH=${GIT_BRANCH#origin/} # turns origin/master into master

server_build/build.xml

@@ -83,6 +83,7 @@
 		<antcall target="build-perf" />
 		<antcall target="check-build" />
 		<antcall target="build-all-rpms" />
+		<antcall target="cunit-proxy" />
 		<antcall target="tmp_copy"/>
 		<antcall target="cunit-server" />
 	</target>

server_build/docker_build/Dockerfile.localRPM.imaproxy

@@ -33,7 +33,11 @@ RUN yum -y install dnf-plugins-core || true
 RUN dnf config-manager --set-enabled powertools || true
 
 # Hopefully we can now install all the required prereqs, this is not optional
-RUN yum -y install gdb net-tools openssh-clients openssl tar perl zip logrotate bzip2 unzip cronie less libedit-devel curl libbson mongo-c-driver
+RUN yum -y install gdb net-tools openssh-clients openssl tar perl zip logrotate bzip2 unzip cronie less libedit-devel libbson mongo-c-driver
+
+# For almalinux 8 we need to install curl, for 9 we can use the already installed curl-minimal which conflicts with curl as long as one is installed
+# we are good to go
+RUN yum -y install curl-minimal || yum -y install curl
 
 # Install the Bridge itself
 RUN yum -y install /tmp/imaproxy.rpm