Skip to content

Commit

Permalink
Merge pull request #41 from DLR-SC/integration
Browse files Browse the repository at this point in the history
Release 0.4.0
  • Loading branch information
PhilMFischer authored Jan 31, 2020
2 parents 4c03358 + 22c5f3c commit a6fcf4b
Show file tree
Hide file tree
Showing 43 changed files with 472 additions and 228 deletions.
68 changes: 26 additions & 42 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
language: java
dist: xenial

jdk:
- oraclejdk8
- openjdk8

services:
# -----------------------------------------------------
# Start up xvfb service for SWT bot GUI tests
# -----------------------------------------------------
- xvfb

cache:
directories:
- $HOME/.m2
Expand All @@ -20,6 +26,7 @@ addons:
apt:
packages:
- metacity
- expect

install:
- true
Expand All @@ -33,30 +40,32 @@ stages:

env:
global:
# -------------------------------
# set the display for UI testing
# -------------------------------
- DISPLAY=:99.0
# ---------------------------------------------
# API Token for access to github
# ---------------------------------------------
- secure: SNRF9Ys0OTI6zoFn88N8gxsadU7Ifu+G7B5kJfBmtRnVXoubUmpbve+sBgmk9OuHcpcmUnxvs2sOopjBOQBjmFMF7pZ699e4z6KLyhZTJG4wqiYkeTAt5uUixSaZ3BE0C07qC3rA/u4OD1GlBEEDGhUvDzddbgmUotvoUUi3+BCwyUBTAw64oR4z5wJADWX6eGqvLZ4oEnpz95A3OuNxepStIVDPZE7eACl8nwqztKBRkS3xmV6kKCB2Hzclq4Bk0DPyLDPvomnTaswhssT/NxuV8c6VUH72cjPJWLnMCupkV2Gye7v7XomdfDWTZJv+mZfoWY8eZMn/+zWwbwvKVi2DuTMbjWfwNPyFYI12ZfIRW613S2TITYoLOedo6V4Sh2B8pMJZeeSosAmje9pOdQYTysRz9imTraWd7zEYsQEcUCwCvJEtLHDFOJhXZT4OZ3hOyEv2FSI831/UJRlXRxwQJCOsPXO7sLNy3qY3vHE8P7IJjy8F3Mzx7IzX21B1exquE+PnI2FW3AEMUjnySCm28QOMXHrsb5Qi4CoNz3RaRevQsjo6wVNr/Idgh0CEMvDLzbtilFfcwnfl3Fa2phcN+TT3e+u6UNTuZNHhpXl/+gfnq61VhlZNEE6q2U6g6Bk+YLhjCFEfY4fIcEd/LIWSJcJ0i9SOJ0VJL5VKw+I=

before_script:
# --------------------------------------------------
# Start the XVFB Service for ui testing as suggested
# by the travis documentation
# --------------------------------------------------
- sh -e /etc/init.d/xvfb start
# -----------------------------------
# Startup the metacity window manager
# -----------------------------------
- metacity --sm-disable --replace 2> metacity.err &
# --------------------------------------
# Start the ssh agent
# --------------------------------------
- eval "$(ssh-agent -s)"
# ----------------------------------------
# Decrypt the key for accessign the
# deployment store and add it to ssh-agent
# ----------------------------------------
- mkdir -p -m 700 /tmp/.sourceforge_ssh
- openssl aes-256-cbc -K $encrypted_eeacdccef9d1_key -iv $encrypted_eeacdccef9d1_iv -in id_ed25519.enc -out /tmp/.sourceforge_ssh/id_ed25519 -d
- chmod 600 /tmp/.sourceforge_ssh/id_ed25519
- bash/ssh-add-password -k /tmp/.sourceforge_ssh/id_ed25519 -p ${ssh_password} 2>/dev/null

after_success:
- bash <(curl -s https://codecov.io/bash)


jobs:
include:
# -----------------------------------------------------------
Expand Down Expand Up @@ -97,14 +106,6 @@ jobs:
- echo "Check for failed test cases:"
- (grep -n "<<< FAILURE!" maven.log || exit 0 && exit 1;)
before_deploy:
# ----------------------------------------
# Decrypt the key for accessign the
# deployment store and add it to ssh-agent
# ----------------------------------------
- openssl aes-256-cbc -K $encrypted_eeacdccef9d1_key -iv $encrypted_eeacdccef9d1_iv -in id_ed25519.enc -out /tmp/id_ed25519 -d
- eval "$(ssh-agent -s)"
- chmod 600 /tmp/id_ed25519
- ssh-add /tmp/id_ed25519
# -----------------------------------------------------------
# Update the development tag beforehand
# And send it back to the origin, otherwise travis will
Expand Down Expand Up @@ -141,8 +142,8 @@ jobs:
# ---------------------------------------------
- provider: script
skip_cleanup: true
script: #
- rsync -e ssh -avP --delete $TRAVIS_BUILD_DIR/deploy/unsecured/p2/DLRMavenTychoDemo/development/ philmfischer@frs.sourceforge.net:/home/frs/project/maven-tycho-demo/development/
script: #
- rsync -e ssh -avP --delete $TRAVIS_BUILD_DIR/deploy/unsecured/p2/DLRMavenTychoDemo/development/ dlrscmns@frs.sourceforge.net:/home/frs/project/maven-tycho-demo/development/
on:
repo: DLR-SC/Maven-Tycho-Demo
branch: development
Expand All @@ -163,14 +164,6 @@ jobs:
- echo "Check for failed test cases:"
- (grep -n "<<< FAILURE!" maven.log || exit 0 && exit 1;)
before_deploy:
# ----------------------------------------
# Decrypt the key for accessign the
# deployment store and add it to ssh-agent
# ----------------------------------------
- openssl aes-256-cbc -K $encrypted_eeacdccef9d1_key -iv $encrypted_eeacdccef9d1_iv -in id_ed25519.enc -out /tmp/id_ed25519 -d
- eval "$(ssh-agent -s)"
- chmod 600 /tmp/id_ed25519
- ssh-add /tmp/id_ed25519
# -----------------------------------------------------------
# Update the development tag beforehand
# And send it back to the origin, otherwise travis will
Expand Down Expand Up @@ -208,7 +201,7 @@ jobs:
- provider: script
skip_cleanup: true
script: #
- rsync -e ssh -avP $TRAVIS_BUILD_DIR/deploy/unsecured/p2/DLRMavenTychoDemo/integration/ philmfischer@frs.sourceforge.net:/home/frs/project/maven-tycho-demo/integration/
- rsync -e ssh -avP $TRAVIS_BUILD_DIR/deploy/unsecured/p2/DLRMavenTychoDemo/integration/ dlrscmns@frs.sourceforge.net:/home/frs/project/maven-tycho-demo/integration/
on:
repo: DLR-SC/Maven-Tycho-Demo
branch: integration
Expand All @@ -228,15 +221,6 @@ jobs:
- (grep -n "\[\(WARN\|WARNING\|ERROR\)\]" maven.log || exit 0 && exit 1;)
- echo "Check for failed test cases:"
- (grep -n "<<< FAILURE!" maven.log || exit 0 && exit 1;)
before_deploy:
# ----------------------------------------
# Decrypt the key for accessign the
# deployment store and add it to ssh-agent
# ----------------------------------------
- openssl aes-256-cbc -K $encrypted_eeacdccef9d1_key -iv $encrypted_eeacdccef9d1_iv -in id_ed25519.enc -out /tmp/id_ed25519 -d
- eval "$(ssh-agent -s)"
- chmod 600 /tmp/id_ed25519
- ssh-add /tmp/id_ed25519
deploy:
# -----------------------------------------------------------
# Now attach the release to the Release Tag.
Expand All @@ -261,8 +245,8 @@ jobs:
- provider: script
skip_cleanup: true
script: #
- rsync -e ssh -avP $TRAVIS_BUILD_DIR/deploy/secured/p2/DLRMavenTychoDemo/release/ philmfischer@frs.sourceforge.net:/home/frs/project/maven-tycho-demo/release/
- rsync -e ssh -avP $TRAVIS_BUILD_DIR/deploy/secured/p2/DLRMavenTychoDemo/release/ dlrscmns@frs.sourceforge.net:/home/frs/project/maven-tycho-demo/release/
on:
repo: DLR-SC/Maven-Tycho-Demo
tags: true


53 changes: 53 additions & 0 deletions bash/ssh-add-password
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#!/bin/bash

#/*******************************************************************************
# * Copyright (c) 2008-2019 German Aerospace Center (DLR), Simulation and Software Technology, Germany.
# *
# * This program and the accompanying materials are made available under the
# * terms of the Eclipse Public License 2.0 which is available at
# * http://www.eclipse.org/legal/epl-2.0.
# *
# * SPDX-License-Identifier: EPL-2.0
# *******************************************************************************/

# --------------------------------------------------------------------------
# This script handles setting an ssh key and using a pasword that was given by command line
# --------------------------------------------------------------------------

COMMAND=$0

printUsage() {
echo "usage: ${COMMAND} -k <keyfile> -p <password>"
echo ""
echo "Options:"
echo " -k, --keyfile <keyfile> The keyfile to be added to ssh agent."
echo " -p, --password <password> The password to be used when adding the keyfile."
echo " -h, --help Show this help."
echo ""
echo "Copyright by DLR (German Aerospace Center)"
}


while [ "$1" != "" ]; do
case $1 in
-k | --keyfile ) shift
KEY_FILE=$1
;;
-p | --password ) shift
PASSWORD=$1
;;
-h | --help ) printUsage
exit
;;
* ) printUsage
exit 1
esac
shift
done

expect << EOF
spawn ssh-add $KEY_FILE
expect "Enter passphrase"
send "$PASSWORD\r"
expect eof
EOF
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Additional Build Preparations e.g. Updating Version Numbers
</description>

<property name="version">0.3.0</property>
<property name="version">0.4.0</property>
<property name="group.id">de.dlr.maven.tycho.demo</property>
<property name="version.pattern.qualified">[\s]?[0-9]+\.[0-9]+\.[0-9]+\.qualifier</property>
<property name="version.pattern">[\s]?[0-9]+\.[0-9]+\.[0-9]+</property>
Expand Down
22 changes: 11 additions & 11 deletions checkStyle/checkStyleSuppression.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

<suppressions>
<suppress files="[\\/]src-gen[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress files="[\\/]src-dmf[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress files="[\\/]src/gen/java[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress files="[\\/]xtend-gen[\\/]" checks="[a-zA-Z0-9]*"/>
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

<suppressions>
<suppress files="[\\/]src-gen[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress files="[\\/]src-dmf[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress files="[\\/]src/gen/java[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress files="[\\/]xtend-gen[\\/]" checks="[a-zA-Z0-9]*"/>
</suppressions>
Loading

0 comments on commit a6fcf4b

Please sign in to comment.