diff options
| -rw-r--r-- | csit/include-raw-integration-install-robotframework.sh | 34 | ||||
| -rw-r--r-- | policy-db-migrator/pom.xml | 24 | ||||
| -rw-r--r-- | policy-jdk/alpine/pom.xml | 24 | ||||
| -rw-r--r-- | policy-jre/alpine/pom.xml | 24 | ||||
| -rw-r--r-- | utils/groovy/docker-tag.groovy | 2 |
5 files changed, 34 insertions, 74 deletions
diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh index ca589b45..1fb107b6 100644 --- a/csit/include-raw-integration-install-robotframework.sh +++ b/csit/include-raw-integration-install-robotframework.sh @@ -1,27 +1,30 @@ #!/bin/bash -# SPDX-License-Identifier: EPL-1.0 -############################################################################## -# Copyright (c) 2015 The Linux Foundation and others. +# +# ============LICENSE_START=================================================== +# Copyright (c) 2016 The Linux Foundation and others. # Modification Copyright 2021. Nordix Foundation. # Modification Copyright 2021 AT&T Intellectual Property. All rights reserved. +# ============================================================================ +# 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. +# ============LICENSE_END===================================================== # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -############################################################################## -# vim: sw=4 ts=4 sts=4 et ft=sh : -ROBOT_VENV="/tmp/v/robot" -echo ROBOT_VENV="${ROBOT_VENV}" >> "${WORKSPACE}/env.properties" +ROBOT_VENV=$(mktemp -d --suffix=robot_venv) +echo "ROBOT_VENV=${ROBOT_VENV}" >> "${WORKSPACE}/env.properties" echo "Python version is: $(python3 --version)" -# The --system-site-packages parameter allows us to pick up system level -# installed packages. This allows us to bake matplotlib which takes very long -# to install into the image. python3 -m venv "${ROBOT_VENV}" - source "${ROBOT_VENV}/bin/activate" set -exu @@ -31,5 +34,4 @@ python3 -m pip install --upgrade pip echo "Installing Python Requirements" python3 -m pip install -r pylibs.txt -odltools -V python3 -m pip freeze diff --git a/policy-db-migrator/pom.xml b/policy-db-migrator/pom.xml index 709f8176..dd3a32c7 100644 --- a/policy-db-migrator/pom.xml +++ b/policy-db-migrator/pom.xml @@ -48,9 +48,9 @@ <finalName>${project.artifactId}-${project.version}</finalName> <plugins> <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> <executions> <execution> <phase>validate</phase> @@ -58,21 +58,7 @@ <goal>execute</goal> </goals> <configuration> - <source> - println 'Project version: ' + project.properties['dist.project.version']; - def versionArray; - if ( project.properties['dist.project.version'] != null ) { - versionArray = project.properties['dist.project.version'].split('-'); - } - - if ( project.properties['dist.project.version'].endsWith("-SNAPSHOT") ) { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest"; - } - - println 'New tag for docker: ' + project.properties['project.docker.latesttag.version']; - </source> + <source>https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy</source> </configuration> </execution> </executions> @@ -95,7 +81,7 @@ <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> </tags> </build> </image> diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml index c89cd7d6..a4a3a104 100644 --- a/policy-jdk/alpine/pom.xml +++ b/policy-jdk/alpine/pom.xml @@ -43,9 +43,9 @@ <finalName>${project.artifactId}-${project.version}</finalName> <plugins> <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> <executions> <execution> <phase>validate</phase> @@ -53,21 +53,7 @@ <goal>execute</goal> </goals> <configuration> - <source> - println 'Project version: ' + project.properties['dist.project.version']; - def versionArray; - if ( project.properties['dist.project.version'] != null ) { - versionArray = project.properties['dist.project.version'].split('-'); - } - - if ( project.properties['dist.project.version'].endsWith("-SNAPSHOT") ) { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest"; - } - - println 'New tag for docker: ' + project.properties['project.docker.latesttag.version']; - </source> + <source>https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy</source> </configuration> </execution> </executions> @@ -90,7 +76,7 @@ <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> </tags> </build> </image> diff --git a/policy-jre/alpine/pom.xml b/policy-jre/alpine/pom.xml index 21322097..50617c73 100644 --- a/policy-jre/alpine/pom.xml +++ b/policy-jre/alpine/pom.xml @@ -43,9 +43,9 @@ <finalName>${project.artifactId}-${project.version}</finalName> <plugins> <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> <executions> <execution> <phase>validate</phase> @@ -53,21 +53,7 @@ <goal>execute</goal> </goals> <configuration> - <source> - println 'Project version: ' + project.properties['dist.project.version']; - def versionArray; - if ( project.properties['dist.project.version'] != null ) { - versionArray = project.properties['dist.project.version'].split('-'); - } - - if ( project.properties['dist.project.version'].endsWith("-SNAPSHOT") ) { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest"; - } else { - project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest"; - } - - println 'New tag for docker: ' + project.properties['project.docker.latesttag.version']; - </source> + <source>https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy</source> </configuration> </execution> </executions> @@ -90,7 +76,7 @@ <tags> <tag>${project.version}</tag> <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> </tags> </build> </image> diff --git a/utils/groovy/docker-tag.groovy b/utils/groovy/docker-tag.groovy index 432deb93..1360974a 100644 --- a/utils/groovy/docker-tag.groovy +++ b/utils/groovy/docker-tag.groovy @@ -30,5 +30,5 @@ if (project.properties['dist.project.version'] != null) { project.properties['project.docker.latest.minmax.tag.version'] = minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-STAGING-latest" } - println 'New tag for docker: ' + properties['project.docker.latest.minmax.tag.version'] + println 'New tag for docker: ' + project.properties['project.docker.latest.minmax.tag.version'] } |