Merge "[OOM] use ramdisk to store chartmuseum packages"
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 72af197..f962c14 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -24,7 +24,7 @@
build-node: ubuntu1804-docker-8c-8g
container-public-registry: 'nexus3.onap.org:10001'
container-snapshot-registry: 'nexus3.onap.org:10003'
- mvn-params: '-Dmaven.test.skip=true -P docker'
+ mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
maven-versions-plugin: true
- '{project-name}-{stream}-docker-staging':
script:
diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
index 4dd27b6..3f53eea 100644
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ b/jjb/music/music-distributed-kv-store-csit.yaml
@@ -7,6 +7,7 @@
- '{project-name}-merge-verification-{stream}'
project-name: 'music-distributed-kv-store'
project: 'music/distributed-kv-store'
+ disabled: true
stream: 'master'
artifact-type: 'golang'
java-version: openjdk11
diff --git a/jjb/vnfsdk/generate-dosc.sh b/jjb/vnfsdk/generate-dosc.sh
index 96ce897..06b00ab 100644
--- a/jjb/vnfsdk/generate-dosc.sh
+++ b/jjb/vnfsdk/generate-dosc.sh
@@ -1,3 +1,11 @@
#!/bin/bash
-mvn clean install -DskipDocsGeneration=false
+cd $WORKSPACE/csarvalidation/python/
+virtualenv -p python3 ./venv
+source ./venv/bin/activate
+pip install --upgrade pip
+pip install -r ./requirements.txt
+
+cd ./main
+export OUTPUT_DIRECTORY="$WORKSPACE/generated/active-validation-rules/Honolulu/"
+python3 ./generate_active_validation_rules_table.py
diff --git a/jjb/vnfsdk/upload-artifact.sh b/jjb/vnfsdk/upload-artifact.sh
index a307ad6..3e07fd5 100644
--- a/jjb/vnfsdk/upload-artifact.sh
+++ b/jjb/vnfsdk/upload-artifact.sh
@@ -5,7 +5,7 @@
echo "ERROR: NO PROJECT ID ENTERED"
exit 1
else
- cd $WORKSPACE/csarvalidation/target/generated-docs/Honolulu
+ cd $WORKSPACE/generated/active-validation-rules/Honolulu/
for file in *.csv ; do
echo "-n --upload-file $file https://nexus.onap.org/content/sites/raw/$PROJECT_ID/Honolulu/$file"
curl -n --upload-file "$file" "https://nexus.onap.org/content/sites/raw/$PROJECT_ID/Honolulu/$file"