diff options
author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-03-31 22:36:16 +0200 |
---|---|---|
committer | Raphaƫl Cotty <raphael.cotty@gmail.com> | 2021-09-30 20:48:55 +0000 |
commit | 3318df5ffe2b67ee67efff02259c51a9cc21a253 (patch) | |
tree | c5c8dc0ff60a6cb536a266ed2c25d44367df145d /docker/focal | |
parent | 8a2fbcf80de30a464977460f58a1d58187513fc5 (diff) | |
download | qbs-3318df5ffe2b67ee67efff02259c51a9cc21a253.tar.gz |
Add android testing with different ndk versions
New docker images are added to test different android ndks. Those
images don't have Qt so only a subset of the tests are run.
So far I added 3 images: r23 (LTS), r21e (LTS) and r19c
(minimum one).
The other android images also have a new ANDROID_NDK_VERSION
argument set to the r23.
Change-Id: Iaa7c80b9cac1c7888b3297fac13333d22a9ad0bc
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'docker/focal')
-rw-r--r-- | docker/focal/test-android-no-qt.Dockerfile | 105 | ||||
-rw-r--r-- | docker/focal/test-android.Dockerfile | 7 |
2 files changed, 109 insertions, 3 deletions
diff --git a/docker/focal/test-android-no-qt.Dockerfile b/docker/focal/test-android-no-qt.Dockerfile new file mode 100644 index 000000000..e1622043a --- /dev/null +++ b/docker/focal/test-android-no-qt.Dockerfile @@ -0,0 +1,105 @@ +# +# Android SDK/NDK for testing Qbs +# +FROM ubuntu:focal +LABEL Description="Ubuntu test environment for Qbs for Android" + +# Allow colored output on command line. +ENV TERM=xterm-color + +# +# Make it possible to change UID/GID in the entrypoint script. The docker +# container usually runs as root user on Linux hosts. When the Docker container +# mounts a folder on the host and creates files there, those files would be +# owned by root instead of the current user. Thus we create a user here who's +# UID will be changed in the entrypoint script to match the UID of the current +# host user. +# +ARG USER_UID=1000 +ARG USER_NAME=devel +RUN apt-get update -qq && \ + apt-get install -qq -y \ + ca-certificates \ + gosu \ + sudo && \ + groupadd -g ${USER_UID} ${USER_NAME} && \ + useradd -s /bin/bash -u ${USER_UID} -g ${USER_NAME} -o -c "" -m ${USER_NAME} && \ + usermod -a -G sudo ${USER_NAME} && \ + echo "%devel ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers + +COPY docker/focal/entrypoint.sh /sbin/entrypoint.sh +ENTRYPOINT ["/sbin/entrypoint.sh"] + +# Qbs build dependencies +RUN apt-get update -qq && \ + apt-get install -qq -y --no-install-recommends \ + ca-certificates \ + curl \ + libasan5 \ + libglib2.0-0 \ + openjdk-8-jdk-headless \ + p7zip-full \ + unzip + +ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 +RUN echo "export JAVA_HOME=${JAVA_HOME}" > /etc/profile.d/android.sh && \ + echo "export PATH=${JAVA_HOME}/bin:\${PATH}" >> /etc/profile.d/android.sh + +ARG ANDROID_NDK_VERSION + +ENV ANDROID_HOME="/home/${USER_NAME}/android" +ENV ANDROID_SDK_ROOT=${ANDROID_HOME} +ENV ANDROID_NDK_ROOT=${ANDROID_HOME}/"ndk"/${ANDROID_NDK_VERSION} +ENV PATH="${JAVA_HOME}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin:$PATH" +RUN echo "export ANDROID_HOME=/home/${USER_NAME}/android" >> /etc/profile.d/android.sh && \ + echo "export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" >> /etc/profile.d/android.sh && \ + echo "export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT}" >> /etc/profile.d/android.sh && \ + echo "export PATH=${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin:\$PATH" >> /etc/profile.d/android.sh + +# +# We ned to run the following steps as the target user +# +USER ${USER_NAME} +RUN mkdir ${ANDROID_HOME} + +# Get Android command line tools +ARG COMMAND_LINE_TOOLS_VERSION="6858069" +RUN curl -s https://dl.google.com/android/repository/commandlinetools-linux-${COMMAND_LINE_TOOLS_VERSION}_latest.zip > ${ANDROID_HOME}/commandlinetools.zip && \ + unzip ${ANDROID_HOME}/commandlinetools.zip -d ${ANDROID_HOME} && \ + rm -v ${ANDROID_HOME}/commandlinetools.zip + +# Accept SDK license +ARG ANDROID_PLATFORM="android-29" +ARG BUILD_TOOLS="29.0.2" +RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" --verbose --licenses && \ + sdkmanager "--sdk_root=${ANDROID_HOME}" --update && \ + sdkmanager "--sdk_root=${ANDROID_HOME}" "platforms;${ANDROID_PLATFORM}" + +RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "build-tools;${BUILD_TOOLS}" +RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "platform-tools" +RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "tools" +RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "ndk;${ANDROID_NDK_VERSION}" + +RUN /usr/lib/jvm/java-8-openjdk-amd64/bin/keytool -genkey -keystore /home/${USER_NAME}/.android/debug.keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname 'CN=Android Debug,O=Android,C=US' + +# Install ndk samples in ${ANDROID_NDK_ROOT}/samples +RUN cd ${ANDROID_NDK_ROOT} && \ + curl -sLO https://github.com/android/ndk-samples/archive/master.zip && \ + unzip -q master.zip && \ + rm -v master.zip && \ + mv ndk-samples-master samples + +# Install android-BasicMediaDecoder in ${ANDROID_SDK_ROOT}/samples +RUN mkdir ${ANDROID_SDK_ROOT}/samples && \ + cd ${ANDROID_SDK_ROOT}/samples && \ + curl -sLO https://github.com/googlearchive/android-BasicMediaDecoder/archive/master.zip && \ + unzip -q master.zip && \ + rm -v master.zip && \ + mv android-BasicMediaDecoder-master android-BasicMediaDecoder + +# Download buildtool to generate aab packages in ${ANDROID_SDK_ROOT} +RUN cd ${ANDROID_SDK_ROOT} && \ + curl -sLO https://github.com/google/bundletool/releases/download/1.3.0/bundletool-all-1.3.0.jar + +USER root + diff --git a/docker/focal/test-android.Dockerfile b/docker/focal/test-android.Dockerfile index 11c4a5757..ca7223593 100644 --- a/docker/focal/test-android.Dockerfile +++ b/docker/focal/test-android.Dockerfile @@ -37,7 +37,6 @@ RUN apt-get update -qq && \ curl \ libasan5 \ libglib2.0-0 \ - libgl1-mesa-glx \ openjdk-8-jdk-headless \ p7zip-full \ unzip @@ -46,9 +45,11 @@ ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 RUN echo "export JAVA_HOME=${JAVA_HOME}" > /etc/profile.d/android.sh && \ echo "export PATH=${JAVA_HOME}/bin:\${PATH}" >> /etc/profile.d/android.sh +ARG ANDROID_NDK_VERSION + ENV ANDROID_HOME="/home/${USER_NAME}/android" ENV ANDROID_SDK_ROOT=${ANDROID_HOME} -ENV ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk-bundle +ENV ANDROID_NDK_ROOT=${ANDROID_HOME}/"ndk"/${ANDROID_NDK_VERSION} ENV PATH="${JAVA_HOME}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin:$PATH" RUN echo "export ANDROID_HOME=/home/${USER_NAME}/android" >> /etc/profile.d/android.sh && \ echo "export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}" >> /etc/profile.d/android.sh && \ @@ -77,7 +78,7 @@ RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" --verbose --licenses && \ RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "build-tools;${BUILD_TOOLS}" RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "platform-tools" RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "tools" -RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "ndk-bundle" +RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" "ndk;${ANDROID_NDK_VERSION}" RUN /usr/lib/jvm/java-8-openjdk-amd64/bin/keytool -genkey -keystore /home/${USER_NAME}/.android/debug.keystore -alias androiddebugkey -storepass android -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname 'CN=Android Debug,O=Android,C=US' |