-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mvn-jgitflow:merging 'release/1.1.0-beta' into 'master'
- Loading branch information
Showing
360 changed files
with
8,468 additions
and
2,932 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #!/usr/bin/env bash | ||
| set -e -o pipefail | ||
| echo "trigger dockerhub builds for Tag $GIT_TAG:" | ||
|
|
||
| URLS=( | ||
| "https://registry.hub.docker.com/u/consol/sakuli-ubuntu-xfce/trigger/76b9b474-97e7-472a-a807-fa1829ef4b93/" | ||
| "https://registry.hub.docker.com/u/consol/omd-labs-ubuntu-sakuli/trigger/6cdc0a55-5926-4fd7-81ce-d97e97aee63c/" | ||
| "https://registry.hub.docker.com/u/consol/sakuli-ubuntu-xfce-java/trigger/62342ff8-d1cb-4111-b298-e43ffdf3d4f7/" | ||
| "https://registry.hub.docker.com/u/consol/sakuli-ubuntu-icewm/trigger/453572ea-3272-46b6-a8fb-9ef95c4e655d/" | ||
| "https://registry.hub.docker.com/u/consol/sakuli-ubuntu-icewm-java/trigger/41998b27-c887-4500-b913-9ebf8f643ab7/" | ||
| "https://registry.hub.docker.com/u/consol/sakuli-centos-xfce/trigger/5174c3a9-dc8d-4180-b9d5-97e47c119799/" | ||
| "https://registry.hub.docker.com/u/consol/omd-labs-centos-sakuli/trigger/1541eb97-7147-4100-b9de-371f74f930cb/" | ||
| "https://registry.hub.docker.com/u/consol/sakuli-centos-xfce-java/trigger/f42ab405-b103-4544-9ed5-84d37dd3ef78/" | ||
| "https://registry.hub.docker.com/u/consol/sakuli-centos-icewm/trigger/8edc4936-c7d8-4618-9c55-b541ba457454/" | ||
| "https://registry.hub.docker.com/u/consol/sakuli-centos-icewm-java/trigger/b5793202-aa0b-47fa-956a-49704f7c6a1e/" | ||
| "https://registry.hub.docker.com/u/consol/omd-labs-debian-sakuli/trigger/f5484b4e-d50d-4c89-be91-edab54ff1446/" | ||
| ) | ||
|
|
||
| ### starting with `v` | ||
| if [[ ${GIT_TAG:0:1} == "v" ]] ; then | ||
| PAYLOAD='{"source_type": "Tag", "source_name": "'$GIT_TAG'"}' | ||
| elif [[ $GIT_TAG == "master" ]] ; then | ||
| PAYLOAD='{"docker_tag": "'latest'"}' | ||
| else | ||
| PAYLOAD='{"docker_tag": "'$GIT_TAG'"}' | ||
| fi | ||
|
|
||
| #Loop | ||
| for URL in "${URLS[@]}" | ||
| do | ||
| echo "URL: $URL" | ||
| echo "PAYLOAD: $PAYLOAD" | ||
| set -x | ||
| curl -H "Content-Type: application/json" --data "$PAYLOAD" -X POST "$URL" | ||
| set +x | ||
| echo " - done!" | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| # This Dockerfile is used to build a sakuli image based on CentOS | ||
|
|
||
| FROM consol/centos-icewm-vnc:1.1.0 | ||
|
|
||
| MAINTAINER Tobias Schneck "[email protected]" | ||
| ENV REFRESHED_AT 2017-04-11 | ||
|
|
||
| LABEL io.k8s.description="Sakuli headless testing container with Xfce window manager, firefox and chromium" \ | ||
| io.k8s.display-name="Sakuli testing container based on Centos and Xfce" \ | ||
| io.openshift.expose-services="6901:http,5901:xvnc" \ | ||
| io.openshift.tags="sakuli, centos, xfce" \ | ||
| io.openshift.non-scalable=true | ||
|
|
||
| ## Connection ports for controlling the UI: | ||
| # VNC port:5901 | ||
| # noVNC webport, connect via http://IP:6901/vnc_auto.html?password=vncpassword | ||
| ENV VNC_PORT 5901 | ||
| ENV NO_VNC_PORT 6901 | ||
| EXPOSE $VNC_PORT $NO_VNC_PORT | ||
|
|
||
| ### Environment config | ||
| ENV VNC_COL_DEPTH 24 | ||
| ENV VNC_RESOLUTION 1280x1024 | ||
| ENV VNC_PW sakuli | ||
|
|
||
| # use root user for installation | ||
| USER root | ||
| # $INST_SCRIPTS is already set in FROM image | ||
| ADD ./sakuli-client/src/common/install/ $INST_SCRIPTS/ | ||
| ADD ./sakuli-client/src/centos/install/ $INST_SCRIPTS/ | ||
| RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} + | ||
|
|
||
| ### Install needed packages | ||
| RUN $INST_SCRIPTS/example_apps.sh | ||
| RUN $INST_SCRIPTS/screenshot_tool.sh | ||
| RUN $INST_SCRIPTS/native_screen_control_libs.sh | ||
| RUN $INST_SCRIPTS/java_jre.sh | ||
| RUN $INST_SCRIPTS/java_jce_test/jce_test.sh | ||
|
|
||
| ### Install Sakuli | ||
| ARG SAKULI_VERSION=1.1.0-beta | ||
| ENV SAKULI_ROOT $HOME/sakuli | ||
| ENV SAKULI_HOME $SAKULI_ROOT/sakuli-v$SAKULI_VERSION | ||
| # Testsuite folder default permissions after text execution | ||
| ENV SAKULI_UMASK 0000 | ||
| # Define Sakuli default startup testsuite | ||
| ENV SAKULI_TEST_SUITE $SAKULI_ROOT/test | ||
| # | ||
| # | ||
| WORKDIR $SAKULI_ROOT | ||
| # Install the $SAKULI_VERSION and create the example testsuite under $SAKULI_TEST_SUITE | ||
| RUN $INST_SCRIPTS/sakuli.sh | ||
|
|
||
| ### configure startup | ||
| ADD ./sakuli-client/src/common/scripts $STARTUPDIR | ||
| RUN $INST_SCRIPTS/set_user_permission.sh $STARTUPDIR $HOME | ||
| # use headless user for startup | ||
| USER 1984 | ||
|
|
||
| ### Sakuli startup script | ||
| # no parameters: | ||
| # - run the suite defined by $SAKULI_TEST_SUITE, if set | ||
| # parameters: | ||
| # - run a Sakuli test suite like the example_xfce case via: | ||
| # docker run consol/sakuli-centos-xfce run /sakuli/example_test_suites/example_xfce | ||
| # - help: | ||
| # docker run consol/sakuli-centos-xfce -help | ||
| # - start a bash (or any other command): | ||
| # docker run -it consol/sakuli-centos-xfce bash | ||
| ENTRYPOINT ["/dockerstartup/startup.sh"] |
Oops, something went wrong.