removed any plugin build

added RC build in hooks and latest tagging
pull/2/head
Luca Pasquali 2021-02-03 17:17:31 +01:00
parent 235f59e492
commit c6dd3c259c
9 changed files with 47 additions and 5 deletions

View File

@ -22,7 +22,6 @@ RUN \
&& [ -d "./geoserver" ] || (mkdir -p ./geoserver && unzip ./geoserver.war -d ./geoserver && rm ./geoserver.war)
RUN apt-get update; apt-get upgrade --yes; apt-get install wget --yes
RUN wget https://downloads.sourceforge.net/project/libjpeg-turbo/1.5.3/libjpeg-turbo-official_1.5.3_amd64.deb && dpkg -i ./libjpeg*.deb && apt-get -f install
WORKDIR /output/plugins
ARG PLUG_IN_URLS=""

View File

@ -156,9 +156,6 @@ function main {
help ${ALL_PARAMETERS}
download_geoserver "${GEOSERVER_VERSION}"
clean_up_directory ${PLUGIN_ARTIFACT_DIRECTORY}
download_plugin ext monitor
download_plugin ext control-flow
download_plugin community sec-oauth2-geonode
if [[ ${GEOSERVER_DATA_DIR_RELEASE} = "nodatadir" ]]; then
build_without_data_dir "${TAG}" "${PULL}"

View File

@ -0,0 +1,9 @@
version: "3.8"
services:
sut:
image: ${DOCKER_REPO}:$VERSION
command: /docker/tests/run_tests.sh
environment:
- SOURCE_BRANCH
ports:
- 8080:8080

View File

@ -1,6 +1,7 @@
#!/bin/bash -x
PLUG_IN_LIST="monitor control-flow libjpeg-turbo"
#PLUG_IN_LIST="monitor control-flow"
PLUG_IN_LIST=""
NIGHTLY_MASTER_PLUG_IN_VERSION="2.$(expr $MIDDLE_STABLE + 1)-SNAPSHOT"
NIGHTLY_STABLE_PLUG_IN_VERSION="2.$MIDDLE_STABLE-SNAPSHOT"
NIGHTLY_MAINT_PLUG_IN_VERSION="2.$(expr $MIDDLE_STABLE - 1)-SNAPSHOT"
@ -51,5 +52,28 @@ for VERSION in $STABLE_VERSION $MAINT_VERSION; do
--build-arg PLUG_IN_URLS="./resources/geoserver-plugins" \
-f "$DOCKERFILE_PATH" \
-t "${DOCKER_REPO}:$VERSION" .
if [ "$VERSION" == "$LATEST_VERSION" ]; then
docker tag "${DOCKER_REPO}:$VERSION" "${DOCKER_REPO}:latest"
fi
rm -rf ./resources/geoserver-plugins/*
done
for VERSION in RC_VERSION; do
GEOSERVER_URL="https://netcologne.dl.sourceforge.net/project/geoserver/GeoServer/$VERSION/geoserver-$VERSION-war.zip"
mkdir -p ./resources/geoserver-plugins
for PLUG_IN_NAME in $PLUG_IN_LIST; do
echo $PLUG_IN_NAME
echo $VERSION
mkdir -p ./resources/geoserver-plugins
URL="https://netcologne.dl.sourceforge.net/project/geoserver/GeoServer/$VERSION/extensions/geoserver-$VERSION-$PLUG_IN_NAME-plugin.zip"
wget $URL -O ./resources/geoserver-plugins/geoserver-$PLUG_IN_VERSION-$PLUG_IN_NAME-plugin.zip
done
var=$(IFS=$'\ '; echo "${PLUG_IN_URLS[*]}" )
docker build \
--build-arg GEOSERVER_WEBAPP_SRC="$GEOSERVER_URL" \
--build-arg PLUG_IN_URLS="./resources/geoserver-plugins" \
-f "$DOCKERFILE_PATH" \
-t "${DOCKER_REPO}:$VERSION" .
rm -rf ./resources/geoserver-plugins/*
done

View File

@ -9,6 +9,15 @@ for NIGHTLY_VERSION in $NIGHTLY_MASTER_VERSION $NIGHTLY_STABLE_VERSION $NIGHTLY_
done
for VERSION in $STABLE_VERSION $MAINT_VERSION; do
if [ "$(grep $VERSION /tmp/failed_versions)" == "" ]; then
docker push "${DOCKER_REPO}:$VERSION"
if [ "$VERSION" == "$LATEST_VERSION" ]; then
docker push "${DOCKER_REPO}:latest"
fi
fi
done
for VERSION in $RC_VERSION; do
if [ "$(grep $VERSION /tmp/failed_versions)" == "" ]; then
docker push "${DOCKER_REPO}:$VERSION"
fi

4
hooks/test 100644 → 100755
View File

@ -9,3 +9,7 @@ for VERSION in $STABLE_VERSION $MAINT_VERSION; do
#export VERSION=$VERSION
timeout 10m docker-compose -f docker-compose.test.yml run --rm sut || ( echo "test for docker image geoserver:$VERSION failed" && echo $VERSION >> /tmp/failed_versions )
done
for VERSION in $RC_VERSION; do
timeout 10m docker-compose -f docker-compose.test.yml run --rm sut || ( echo "test for docker image geoserver:$VERSION failed" && echo $VERSION >> /tmp/failed_versions )
done