diff options
author | 2021-05-20 15:43:35 +0100 | |
---|---|---|
committer | 2021-05-20 16:40:13 +0100 | |
commit | fa94a96fed5fd7af230a90373a04da47370e2eea (patch) | |
tree | 403698f7b95a884248c1414304e42d23e406d05e /src/main/script | |
parent | 65262f8dd9a6b9cbc284daa02ae332380e374483 (diff) |
Merge master into tosca-poc branch
This review was created with the commands:
git co master
git pull
git co tosca-poc
git pull
git merge -X theirs master
With this merge, the CLAMP master branch is merged into tosca-poc, and,
apart from the tosca-controlloop directory, they are identical
Issue-ID: POLICY-3215
Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'src/main/script')
-rw-r--r-- | src/main/script/SelectNpmRepo.groovy | 34 | ||||
-rw-r--r-- | src/main/script/TagVersion.groovy | 40 | ||||
-rwxr-xr-x | src/main/script/checkLibIndex.sh | 122 |
3 files changed, 0 insertions, 196 deletions
diff --git a/src/main/script/SelectNpmRepo.groovy b/src/main/script/SelectNpmRepo.groovy deleted file mode 100644 index 797d2d003..000000000 --- a/src/main/script/SelectNpmRepo.groovy +++ /dev/null @@ -1,34 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017 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============================================ - * =================================================================== - * - */ - -package org.onap.policy.clamp.clds.maven.scripts - -println project.properties['clamp.project.version']; - -if ( project.properties['clamp.project.version'].endsWith("-SNAPSHOT") ) { - project.properties['npm.publish.url']="https://nexus3.onap.org/repository/npm.snapshot/" -} else { - project.properties['npm.publish.url']="https://nexus3.onap.org/repository/npm.snapshot/" -} - -println 'NPM repository: ' + project.properties['npm.publish.url']; diff --git a/src/main/script/TagVersion.groovy b/src/main/script/TagVersion.groovy deleted file mode 100644 index 271e2967f..000000000 --- a/src/main/script/TagVersion.groovy +++ /dev/null @@ -1,40 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017 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============================================ - * =================================================================== - * - */ - -package org.onap.policy.clamp.maven.scripts - -println project.properties['clamp.project.version']; -def versionArray; -if ( project.properties['clamp.project.version'] != null ) { - versionArray = project.properties['clamp.project.version'].split('\\.'); -} - -if ( project.properties['clamp.project.version'].endsWith("-SNAPSHOT") ) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; - project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-"+project.properties['clamp.build.timestamp']; -} else { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-"+project.properties['clamp.build.timestamp']; -} - -println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
\ No newline at end of file diff --git a/src/main/script/checkLibIndex.sh b/src/main/script/checkLibIndex.sh deleted file mode 100755 index 9a28e7df9..000000000 --- a/src/main/script/checkLibIndex.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash -### -# ============LICENSE_START======================================================= -# ONAP CLAMP -# ================================================================================ -# Copyright (C) 2020 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============================================ -# =================================================================== -# -### - -baseDir=$(git rev-parse --show-toplevel) - -if [[ ! -d $baseDir ]] -then - echo "[ERROR] failed to determine git base directory" - exit 1 -fi - -tmpSrcFileList=/tmp/upldateLibIndex.$$.list -reactUiBaseDir="${baseDir}/ui-react" -reactLibIndexFile="ui-react-lib/libIndex.js" -exclusionList="ui-react-lib/libExportExclusions.dat" - - -if [[ ! -d "$reactUiBaseDir" ]] -then - echo "[ERROR] reacUiBaseDir=$reacUiBaseDir is not accessible" - exit 1 -fi - -if [[ ! -d "$baseDir/$reactLibBaseDir" ]] -then - echo "[ERROR] reactLibBaseDir=$baseDir/$reactLibBaseDir is not accessible" - exit 1 -fi - -if [[ ! -r "$baseDir/$reactLibIndexFile" ]] -then - echo "[ERROR] file reactLibIndexFile=$baseDir/$reactLibIndexFile is not accessible" - exit 1 -fi - - -if ! cd $reactUiBaseDir -then - echo "[ERROR] could not cd to reactUiBaseDir=$reactUiBaseDir" - exit 1 -fi - -find ./src -name \*.js | egrep -v "__snapshot|\.test\." 2>/dev/null | sed 's/.js$//' > $tmpSrcFileList - -if [[ ! -s $tmpSrcFileList ]] -then - echo "[ERROR] no source files found in reactUiBaseDir=$reactUiBaseDir" - rm -f $tmpSrcFileList - exit 1 -fi - -export nErrors=0 - -# Verify that any .js file found within ui-react/src other than test related files -# is also referenced in ui-react-lib/libIndex.js - -for srcFileName in `<$tmpSrcFileList` -do - if [[ -r "$baseDir/$exclusionList" ]] - then - if grep $srcFileName $baseDir/$exclusionList >/dev/null 2>&1 - then - continue - fi - fi - - if ! grep $srcFileName "$baseDir/$reactLibIndexFile" > /dev/null 2>&1 - then - echo "[ERROR] file=${srcFileName}.js is not declared in $reactLibIndexFile" - echo "[ERROR] and not found in exclsionList=${exclusionList}." - echo "[ERROR] Please either add it to $reactLibIndexFile" - echo "[ERROR] or to the exclusion list in ${exclusionList}." - echo "" - (( nErrors++ )) - fi -done - -# Verify for each entry in ui-react-lib/libIndex.js, that the referenced source file exists -# in ui-react/src; if not, developer probably forgot to remove it from libIndex.js. - -egrep '^export ' $baseDir/$reactLibIndexFile |\ -sed -e "s+.*\./src+./src+" -e "s+'.*+.js+" > $tmpSrcFileList - -for srcFileName in `<$tmpSrcFileList` -do - if [[ ! -r "$srcFileName" ]] - then - echo "[ERROR] source file=$srcFileName in libIndex.js is not accessible" - (( nErrors++ )) - fi -done - -rm -f $tmpSrcFileList - -if (( nErrors == 0 )) -then - echo "[INFO] $reactLibIndexFile passes sanity check" - exit 0 -fi - -exit $nErrors |