diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aed86892eb5..7331cb2290d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,21 @@ jobs: run: | ./gradlew :testcontainers:check --no-daemon --continue --scan + turbo-mode: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v3 + - uses: ./.github/actions/setup-build + - name: Setup Testcontainers Cloud Client + uses: atomicjar/testcontainers-cloud-setup-action@main + with: + token: ${{ secrets.TC_CLOUD_TOKEN }} + args: --max-concurrency=4 + - name: Test using Testcontainers Cloud with Turbo Mode enabled + working-directory: ./smoke-test/ + run: | + ./gradlew --no-daemon --continue --scan --info ${{matrix.gradle_args}} + find_gradle_jobs: needs: [core] runs-on: ubuntu-22.04 diff --git a/smoke-test/build.gradle b/smoke-test/build.gradle new file mode 100644 index 00000000000..830cfaf0b66 --- /dev/null +++ b/smoke-test/build.gradle @@ -0,0 +1,21 @@ +// empty build.gradle for dependabot +plugins { + id 'com.diffplug.spotless' version '6.13.0' apply false +} + +apply from: "$rootDir/../gradle/ci-support.gradle" + +subprojects { + apply plugin: "java" + apply from: "$rootDir/../gradle/spotless.gradle" + apply plugin: 'checkstyle' + + repositories { + mavenCentral() + } + + checkstyle { + toolVersion = "9.3" + configFile = rootProject.file('../config/checkstyle/checkstyle.xml') + } +} diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.jar b/smoke-test/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..c1962a79e29 Binary files /dev/null and b/smoke-test/gradle/wrapper/gradle-wrapper.jar differ diff --git a/smoke-test/gradle/wrapper/gradle-wrapper.properties b/smoke-test/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..37aef8d3f0c --- /dev/null +++ b/smoke-test/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/smoke-test/gradlew b/smoke-test/gradlew new file mode 100755 index 00000000000..aeb74cbb43e --- /dev/null +++ b/smoke-test/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/smoke-test/gradlew.bat b/smoke-test/gradlew.bat new file mode 100644 index 00000000000..6689b85beec --- /dev/null +++ b/smoke-test/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/smoke-test/settings.gradle b/smoke-test/settings.gradle new file mode 100644 index 00000000000..68ba54d2f13 --- /dev/null +++ b/smoke-test/settings.gradle @@ -0,0 +1,50 @@ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0" + classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.14.1" + classpath "com.gradle:common-custom-user-data-gradle-plugin:1.11.1" + } +} + +apply plugin: 'com.gradle.enterprise' +apply plugin: "com.gradle.common-custom-user-data-gradle-plugin" + +rootProject.name = 'testcontainers-smoke-tests' + +includeBuild '..' + +// explicit include to allow Dependabot to autodiscover subprojects +include 'turbo-mode' + +ext.isCI = System.getenv("CI") != null + +buildCache { + local { + enabled = !isCI + } + remote(HttpBuildCache) { + push = isCI && !System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") + enabled = true + url = 'https://ge.testcontainers.org/cache/' + credentials { + username = 'ci' + password = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD") + } + } +} + +gradleEnterprise { + buildScan { + server = "https://ge.testcontainers.org/" + publishAlways() + publishIfAuthenticated() + uploadInBackground = !isCI + captureTaskInputFiles = true + } + +} diff --git a/smoke-test/turbo-mode/build.gradle b/smoke-test/turbo-mode/build.gradle new file mode 100644 index 00000000000..a84c1d5fb48 --- /dev/null +++ b/smoke-test/turbo-mode/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' +} + +dependencies { + testImplementation 'org.testcontainers:testcontainers' + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0' + testImplementation 'ch.qos.logback:logback-classic:1.3.8' + testImplementation 'org.assertj:assertj-core:3.24.2' +} + +test { + useJUnitPlatform() + forkEvery = 1 + maxParallelForks = 4 +} diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java new file mode 100644 index 00000000000..8750d1c87f1 --- /dev/null +++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/AbstractRedisContainer.java @@ -0,0 +1,18 @@ +package org.testcontainers.example; + +import org.testcontainers.containers.GenericContainer; + +import static org.assertj.core.api.Assertions.assertThat; + +class AbstractRedisContainer { + + private static final String REDIS_IMAGE = "redis:7.0.12-alpine"; + + void runRedisContainer() { + try (GenericContainer redis = new GenericContainer<>(REDIS_IMAGE).withExposedPorts(6379) + .withCreateContainerCmdModifier(cmd -> cmd.withName("tc-redis"))) { + redis.start(); + assertThat(redis.isRunning()).isTrue(); + } + } +} diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer1Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer1Test.java new file mode 100644 index 00000000000..4271e6b6caa --- /dev/null +++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer1Test.java @@ -0,0 +1,11 @@ +package org.testcontainers.example; + +import org.junit.jupiter.api.Test; + +class RedisContainer1Test extends AbstractRedisContainer { + + @Test + void testSimple() { + runRedisContainer(); + } +} diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer2Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer2Test.java new file mode 100644 index 00000000000..930196af5c0 --- /dev/null +++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer2Test.java @@ -0,0 +1,11 @@ +package org.testcontainers.example; + +import org.junit.jupiter.api.Test; + +class RedisContainer2Test extends AbstractRedisContainer { + + @Test + void testSimple() { + runRedisContainer(); + } +} diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer3Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer3Test.java new file mode 100644 index 00000000000..5afc93fd455 --- /dev/null +++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer3Test.java @@ -0,0 +1,11 @@ +package org.testcontainers.example; + +import org.junit.jupiter.api.Test; + +class RedisContainer3Test extends AbstractRedisContainer { + + @Test + void testSimple() { + runRedisContainer(); + } +} diff --git a/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer4Test.java b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer4Test.java new file mode 100644 index 00000000000..b5a021bf049 --- /dev/null +++ b/smoke-test/turbo-mode/src/test/java/org/testcontainers/example/RedisContainer4Test.java @@ -0,0 +1,11 @@ +package org.testcontainers.example; + +import org.junit.jupiter.api.Test; + +class RedisContainer4Test extends AbstractRedisContainer { + + @Test + void testSimple() { + runRedisContainer(); + } +} diff --git a/smoke-test/turbo-mode/src/test/resources/logback-test.xml b/smoke-test/turbo-mode/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..83ef7a1a3ef --- /dev/null +++ b/smoke-test/turbo-mode/src/test/resources/logback-test.xml @@ -0,0 +1,16 @@ + + + + + + %d{HH:mm:ss.SSS} %-5level %logger - %msg%n + + + + + + + + +