This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e015f6d0b0a29da015f97e99bf49894e3f777067 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Jun 23 11:03:33 2021 +0700 JAMES-3603 Remove no longer needed compilation and merge dockerfiles These are unused by the Jenkins 2 build... --- .../compilation/java-11/.testcontainers.properties | 1 - dockerfiles/compilation/java-11/Dockerfile | 26 ---- dockerfiles/compilation/java-11/compile.sh | 138 --------------------- .../compilation/java-11/integration_tests.sh | 70 ----------- dockerfiles/merge/Dockerfile | 12 -- dockerfiles/merge/merge.sh | 42 ------- 6 files changed, 289 deletions(-) diff --git a/dockerfiles/compilation/java-11/.testcontainers.properties b/dockerfiles/compilation/java-11/.testcontainers.properties deleted file mode 100644 index 71f1d22..0000000 --- a/dockerfiles/compilation/java-11/.testcontainers.properties +++ /dev/null @@ -1 +0,0 @@ -checks.disable=true \ No newline at end of file diff --git a/dockerfiles/compilation/java-11/Dockerfile b/dockerfiles/compilation/java-11/Dockerfile deleted file mode 100644 index ad36fd1..0000000 --- a/dockerfiles/compilation/java-11/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# Build James -# -# VERSION 1.0 - -FROM adoptopenjdk:11-jdk-hotspot - -ENV GIT_VERSION 1:2.11.0-3 - -# Install git -RUN apt-get update -RUN apt-get install -y git wget unzip - -# Install Maven -WORKDIR /root -RUN wget https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -RUN tar -xvf apache-maven-3.6.3-bin.tar.gz -RUN ln -s /root/apache-maven-3.6.3/bin/mvn /usr/bin/mvn - -# Copy the script -COPY compile.sh /root/compile.sh -COPY integration_tests.sh /root/integration_tests.sh -COPY .testcontainers.properties /root/.testcontainers.properties - -# Define the entrypoint -WORKDIR /james-project -ENTRYPOINT ["/root/compile.sh"] diff --git a/dockerfiles/compilation/java-11/compile.sh b/dockerfiles/compilation/java-11/compile.sh deleted file mode 100755 index e08855d..0000000 --- a/dockerfiles/compilation/java-11/compile.sh +++ /dev/null @@ -1,138 +0,0 @@ -#!/bin/sh -e -# - -printUsage() { - echo "Usage : " - echo "./compile.sh [-s | --skipTests] SHA1" - echo " -s: Skip test" - echo " SHA1: SHA1 to build (optional)" - echo "" - echo "Environment:" - echo " - MVN_ADDITIONAL_ARG_LINE: Allow passing additional command arguments to the maven command" - exit 1 -} - -GLOW_ROOT_URL=https://github.com/glowroot/glowroot/releases/download/v0.13.4/glowroot-0.13.4-dist.zip -GLOW_ROOT_DIR=glowroot -GLOW_ROOT_ZIP=glowroot.zip -GLOW_ROOT_JAR=${GLOW_ROOT_DIR}/glowroot.jar -GLOW_ROOT_LIB=${GLOW_ROOT_DIR}/lib - -ORIGIN=/origin -CASSANDRA_DESTINATION=/cassandra/destination -CASSANDRA_RABBITMQ_DESTINATION=/cassandra-rabbitmq/destination -JPA_DESTINATION=/jpa/destination -JPA_SMTP_DESTINATION=/jpa-smtp/destination -MEMORY_DESTINATION=/memory/destination -SPRING_DESTINATION=/spring/destination -SWAGGER_DESTINATION=/swagger - -for arg in "$@" -do - case $arg in - -s|--skipTests) - SKIPTESTS="skipTests" - ;; - -*) - echo "Invalid option: -$OPTARG" - printUsage - ;; - *) - if ! [ -z "$1" ]; then - SHA1=$1 - fi - ;; - esac - if [ "0" -lt "$#" ]; then - shift - fi -done - -if [ -z "$SHA1" ]; then - SHA1=master -fi - -# Sources retrieval -git clone $ORIGIN/. -git checkout $SHA1 - -# Compilation - -if [ "$SKIPTESTS" = "skipTests" ]; then - mvn package -DskipTests ${MVN_ADDITIONAL_ARG_LINE} -else - mvn package ${MVN_ADDITIONAL_ARG_LINE} -fi - -# download glowroot jar -wget -O $GLOW_ROOT_ZIP $GLOW_ROOT_URL -unzip $GLOW_ROOT_ZIP -# Retrieve result - -if [ $? -eq 0 ]; then - - if [ -d "$CASSANDRA_RABBITMQ_DESTINATION" ]; then - echo "Copying cassandra RabbitMQ JARs" - cp server/apps/distributed-app/target/james-server-distributed-app.zip $CASSANDRA_RABBITMQ_DESTINATION || true - cp server/container/cli/target/james-server-cli.jar $CASSANDRA_RABBITMQ_DESTINATION || true - cp -r server/container/cli/target/james-server-cli.lib $CASSANDRA_RABBITMQ_DESTINATION || true - - mkdir -p ${CASSANDRA_RABBITMQ_DESTINATION}/glowroot - cp -r ${GLOW_ROOT_DIR}/* ${CASSANDRA_RABBITMQ_DESTINATION}/glowroot || true - fi - - if [ -d "$CASSANDRA_DESTINATION" ]; then - echo "Copying cassandra JARs" - cp server/apps/cassandra-app/target/james-server-cassandra-app.zip $CASSANDRA_DESTINATION || true - cp server/container/cli/target/james-server-cli.jar $CASSANDRA_DESTINATION || true - cp -r server/container/cli/target/james-server-cli.lib $CASSANDRA_DESTINATION || true - - mkdir -p ${CASSANDRA_DESTINATION}/glowroot - cp -r ${GLOW_ROOT_DIR}/* ${CASSANDRA_DESTINATION}/glowroot || true - fi - - if [ -d "$JPA_DESTINATION" ]; then - echo "Copying JPA jars" - cp server/apps/jpa-app/target/james-server-jpa-app.zip $JPA_DESTINATION || true - cp server/container/cli/target/james-server-cli.jar $JPA_DESTINATION || true - cp -r server/container/cli/target/james-server-cli.lib $JPA_DESTINATION || true - mkdir -p ${JPA_DESTINATION}/glowroot - cp -r ${GLOW_ROOT_DIR}/* ${JPA_DESTINATION}/glowroot || true - fi - - if [ -d "$JPA_SMTP_DESTINATION" ]; then - echo "Copying JPA-SMTP jars" - cp server/container/apps/jpa-smtp-app/target/james-server-jpa-smtp-app.zip $JPA_SMTP_DESTINATION || true - cp server/container/cli/target/james-server-cli.jar $JPA_SMTP_DESTINATION || true - cp -r server/container/cli/target/james-server-cli.lib $JPA_SMTP_DESTINATION || true - mkdir -p ${JPA_SMTP_DESTINATION}/glowroot - cp -r ${GLOW_ROOT_DIR}/* ${JPA_SMTP_DESTINATION}/glowroot || true - fi - - if [ -d "$MEMORY_DESTINATION" ]; then - echo "Copying memory JARs" - cp server/apps/memory-app/target/james-server-memory-app.zip $MEMORY_DESTINATION || true - cp server/container/cli/target/james-server-cli.jar $MEMORY_DESTINATION || true - cp -r server/container/cli/target/james-server-cli.lib $MEMORY_DESTINATION || true - mkdir -p ${MEMORY_DESTINATION}/glowroot - cp -r ${GLOW_ROOT_DIR}/* ${MEMORY_DESTINATION}/glowroot || true - unzip $MEMORY_DESTINATION/james-server-memory-app.zip - fi - - if [ -d "$SPRING_DESTINATION" ]; then - echo "Copying SPRING jars" - cp server/apps/spring-app/target/james-server-app-*-app.zip $SPRING_DESTINATION - mkdir -p ${SPRING_DESTINATION}/glowroot - cp -r ${GLOW_ROOT_DIR}/* ${SPRING_DESTINATION}/glowroot || true - fi - - if [ -d "$SWAGGER_DESTINATION" ]; then - cp server/protocols/webadmin/webadmin-data/target/webadmin-data.json $SWAGGER_DESTINATION || true - cp server/protocols/webadmin/webadmin-mailbox/target/webadmin-mailbox.json $SWAGGER_DESTINATION || true - cp server/protocols/webadmin/webadmin-swagger/target/webadmin-swagger.json $SWAGGER_DESTINATION || true - fi -fi - -# delete temporary glowroot files -rm $GLOW_ROOT_ZIP -rm -rf $GLOW_ROOT_DIR diff --git a/dockerfiles/compilation/java-11/integration_tests.sh b/dockerfiles/compilation/java-11/integration_tests.sh deleted file mode 100755 index 1b2d71d..0000000 --- a/dockerfiles/compilation/java-11/integration_tests.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -e - -printUsage() { - echo "Usage : " - echo "./integration_tests.sh URL BRANCH JAMES_IP JAMES_IMAP_PORT" - echo " JAMES_IP: IP of the James server to be tests" - echo " JAMES_IMAP_PORT: Exposed IMAP port of this James server" - echo " JAMES_SMTP_PORT: Exposed SMTP port of this James server" - echo " SHA1(optional): Branch to build or master if none" - echo "" - echo "Environment:" - echo " - MVN_ADDITIONAL_ARG_LINE: Allow passing additional command arguments to the maven command" - exit 1 -} - -ORIGIN=/origin - -for arg in "$@" -do - case $arg in - -*) - echo "Invalid option: -$OPTARG" - printUsage - ;; - *) - if ! [ -z "$1" ]; then - JAMES_ADDRESS=$1 - fi - if ! [ -z "$2" ]; then - JAMES_IMAP_PORT=$2 - fi - if ! [ -z "$3" ]; then - JAMES_SMTP_PORT=$3 - fi - if ! [ -z "$4" ]; then - SHA1=$4 - fi - ;; - esac -done - -if [ -z "$JAMES_ADDRESS" ]; then - echo "You must provide a JAMES_ADDRESS" - printUsage -fi - -if [ -z "$JAMES_IMAP_PORT" ]; then - echo "You must provide a JAMES_IMAP_PORT" - printUsage -fi - -if [ -z "JAMES_SMTP_PORT" ]; then - echo "You must provide a JAMES_SMTP_PORT" - printUsage -fi - -if [ -z "$SHA1" ]; then - SHA1=master -fi - -export JAMES_ADDRESS=$JAMES_ADDRESS -export JAMES_IMAP_PORT=$JAMES_IMAP_PORT -export JAMES_SMTP_PORT=$JAMES_SMTP_PORT - -git clone $ORIGIN/. -git checkout $SHA1 - - -mvn -T 1C -DskipTests -pl org.apache.james:apache-james-mpt-external-james -am install ${MVN_ADDITIONAL_ARG_LINE} -mvn -T 1C -pl org.apache.james:apache-james-mpt-external-james test -Pintegration-tests ${MVN_ADDITIONAL_ARG_LINE} diff --git a/dockerfiles/merge/Dockerfile b/dockerfiles/merge/Dockerfile deleted file mode 100644 index b1a7ca3..0000000 --- a/dockerfiles/merge/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM debian:8.11 - -RUN apt-get update -RUN apt-get install -y git - -RUN git config --global user.email \"merge@localhost\" \ - && git config --global user.name \"Merge\" - -ADD . /origin -WORKDIR /origin - -ENTRYPOINT ["/origin/dockerfiles/merge/merge.sh"] diff --git a/dockerfiles/merge/merge.sh b/dockerfiles/merge/merge.sh deleted file mode 100755 index 25e063d..0000000 --- a/dockerfiles/merge/merge.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -e - -printUsage() { - echo "Usage : " - echo "./merge.sh SHA1 RESULTING_BRANCH ORIGINAL_BRANCH" - echo " SHA1: SHA1 to merge with the branch" - echo " RESULTING_BRANCH : Resulting branch of the merge" - echo " ORIGINAL_BRANCH: the original branch used for merge (if none, then `master` will be used)" - exit 1 -} - -if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then - printUsage -fi - -SHA1=$1 -RESULTING_BRANCH=$2 -if [ "$#" -eq 3 ]; then - ORIGINAL_BRANCH=$3 -else - ORIGINAL_BRANCH=master -fi - -APACHE_REPO=`git remote show | grep apache || true` -if [ -z "$APACHE_REPO" ]; then - git remote add apache https://github.com/apache/james-project.git -fi -# Getting original branch from apache repo -git fetch apache -git checkout apache/$ORIGINAL_BRANCH -B $ORIGINAL_BRANCH - -# Getting the branch to be merged from /origin -git fetch origin -# This is required for non master branches but fails for SHA-1 -git checkout origin/$SHA1 -b $SHA1 || true -git checkout $SHA1 -git checkout -b SHA1_BRANCH - -# Merging the branch to be merged in the original branch -git checkout $ORIGINAL_BRANCH -git checkout -b $RESULTING_BRANCH -git merge --no-edit SHA1_BRANCH --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
