diff options
| author |   Hansen, Tony (th1395) <th1395@att.com> | 2020-06-08 16:20:49 +0000 |
|---|---|---|
| committer | Hansen, Tony (th1395) <th1395@att.com> | 2020-06-08 16:21:56 +0000 |
| commit | 96fb7b13783e4f9958923c4b59d52dc9ff781933 (patch) | |
| tree | 36f9836638d44bf814351bc8aa516ae96aaa9d20 | |
| parent | 3313bf1f2aaee934ed094cd5cb92ddd54f99508e (diff) | |
fix more type version issues
Change-Id: I321407dcf08cb37d8ce8270a3458c50ec489e08e
Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>
Issue-ID: DCAEGEN2-2207
| -rw-r--r-- | dmaap/dmaap.yaml | 2 | ||||
| -rw-r--r-- | helm/helm-type.yaml | 2 | ||||
| -rw-r--r-- | makefile | 22 |
3 files changed, 15 insertions, 11 deletions
diff --git a/dmaap/dmaap.yaml b/dmaap/dmaap.yaml index 5b79f9b..720f68f 100644 --- a/dmaap/dmaap.yaml +++ b/dmaap/dmaap.yaml @@ -25,7 +25,7 @@ plugins: dmaapplugin: executor: 'central_deployment_agent' package_name: dmaap - package_version: 1.4.0 + package_version: 1.5.0 node_types: diff --git a/helm/helm-type.yaml b/helm/helm-type.yaml index 25b66d5..9d55aba 100644 --- a/helm/helm-type.yaml +++ b/helm/helm-type.yaml @@ -19,7 +19,7 @@ plugins: helm-plugin: executor: central_deployment_agent package_name: helm - package_version: 4.1.0 + package_version: 4.2.0 node_types: @@ -15,16 +15,20 @@ verify-versions: echo "$$i version $$v not found in $$p/setup.py. Instead found the above version."; \ exit 1 ; \ fi; \ - if [ -f "$$p"/*types.yaml ]; then \ - if grep "package_version:[[:space:]]*$$v" "$$p"/*types.yaml > /dev/null 2>&1; then \ - echo "$$i version $$v verified in" "$$p"/*types.yaml; \ - else \ - grep -n "<version>" $$i /dev/null | sed 2q | tail -n 1; \ - grep -n "package_version:" "$$p"/*types.yaml /dev/null; \ - exit 1 ; \ - fi; \ + typefiles=$$( grep -l "package_version[[:space:]]*:" $$p/* 2>/dev/null ); \ + if [ -z "$$typefiles" ]; then \ + echo "No type files found in $$p"; \ + exit 1 ; \ else \ - echo "No types file found in $$p"; \ + for typefile in $$typefiles; do \ + if grep "package_version:[[:space:]]*$$v" "$$typefile" > /dev/null 2>&1; then \ + echo "$$i version $$v verified in" "$$typefile"; \ + else \ + grep -n "<version>" $$i /dev/null | sed 2q | tail -n 1; \ + grep -n "package_version:" "$$typefile" /dev/null; \ + exit 1 ; \ + fi; \ + done; \ fi; \ echo; \ done |