diff options
author | fujinhua <fu.jinhua@zte.com.cn> | 2018-03-05 17:36:21 +0800 |
---|---|---|
committer | fujinhua <fu.jinhua@zte.com.cn> | 2018-03-05 17:36:21 +0800 |
commit | fb06463518117fbd5711755f5b4050aca88d45e7 (patch) | |
tree | 87db49131ee0dd8b41e1e0c91b6ef9b309a6a79d | |
parent | 9209fc0dd7f09ea3533e842da16c71f49e1b369b (diff) |
Fix Jenkins Job build error problems
Change-Id: Id6c71cd31e678766954522017c5f76f17969d3cd
Issue-ID: VFC-789
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rwxr-xr-x | zte/vmanager/mvn-phase-script.sh | 80 | ||||
-rw-r--r-- | zte/vmanager/pom.xml | 51 |
2 files changed, 0 insertions, 131 deletions
diff --git a/zte/vmanager/mvn-phase-script.sh b/zte/vmanager/mvn-phase-script.sh deleted file mode 100755 index 6103ce51..00000000 --- a/zte/vmanager/mvn-phase-script.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# Copyright 2018 ZTE Corporation. -# -# 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 -# -# http://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. - - -set -e - -echo "running script: [$0] for module [$1] at stage [$2]" - -export SETTINGS_FILE=${SETTINGS_FILE:-$HOME/.m2/settings.xml} -MVN_PROJECT_MODULEID="$1" -MVN_PHASE="$2" - - -FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}" -if [ "$MVN_PROJECT_MODULEID" == "__" ]; then - MVN_PROJECT_MODULEID="" -fi - -if [ -z "$WORKSPACE" ]; then - WORKSPACE=$(pwd) -fi - - -# mvn phase in life cycle -MVN_PHASE="$2" - - -echo "MVN_PROJECT_MODULEID is [$MVN_PROJECT_MODULEID]" -echo "MVN_PHASE is [$MVN_PHASE]" -echo "MVN_PROJECT_GROUPID is [$MVN_PROJECT_GROUPID]" -echo "MVN_PROJECT_ARTIFACTID is [$MVN_PROJECT_ARTIFACTID]" -echo "MVN_PROJECT_VERSION is [$MVN_PROJECT_VERSION]" - -run_tox_test() -{ - set -x - CURDIR=$(pwd) - TOXINIS=$(find . -name "tox.ini") - for TOXINI in "${TOXINIS[@]}"; do - DIR=$(echo "$TOXINI" | rev | cut -f2- -d'/' | rev) - cd "${CURDIR}/${DIR}" - rm -rf ./venv-tox ./.tox - virtualenv ./venv-tox - source ./venv-tox/bin/activate - pip install --upgrade pip - pip install --upgrade tox argparse - pip freeze - tox - deactivate - rm -rf ./venv-tox ./.tox - done -} - - -case $MVN_PHASE in -clean) - echo "==> clean phase script" - rm -rf ./venv-* - ;; -test) - echo "==> test phase script" - run_tox_test - ;; -*) - echo "==> unprocessed phase" - ;; -esac - diff --git a/zte/vmanager/pom.xml b/zte/vmanager/pom.xml index aa152a58..f6a20dcf 100644 --- a/zte/vmanager/pom.xml +++ b/zte/vmanager/pom.xml @@ -38,59 +38,8 @@ </properties> <description>vfc nfvo driver-vnfm-svnfm-zte-vmanager</description> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <configuration> - <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - </environmentVariables> - </configuration> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <executions> - <execution> - <id>clean phase script</id> - <phase>clean</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>__</argument> - <argument>clean</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>test script</id> - <phase>test</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>__</argument> - <argument>test</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <appendAssemblyId>false</appendAssemblyId> |