diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/dcae/include-raw-pgaas.sh | 23 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 4 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/global-templates-python.yaml | 1 | ||||
| -rw-r--r-- | jjb/mso/mso.yaml | 3 |
5 files changed, 19 insertions, 14 deletions
diff --git a/jjb/dcae/include-raw-pgaas.sh b/jjb/dcae/include-raw-pgaas.sh index 505c7698c..cf3936eea 100644 --- a/jjb/dcae/include-raw-pgaas.sh +++ b/jjb/dcae/include-raw-pgaas.sh @@ -6,25 +6,26 @@ echo "============== STARTING SCRIPT TO CREATE DEBIAN FILES =================" export BUILD_NUMBER="${BUILD_ID}" export PATH=$PATH:${WORKSPACE}/buildtools/bin -#export OPENECOMP_NEXUS_RAW="https://nexus.openecomp.org/content/sites/raw" -export OPENECOMP_NEXUS_RAW="${NEXUSPROXY}/content/sites/raw" -export OPENECOMP_NEXUS_USER=$(xpath -q -e \ +export NEXUS_RAW="${NEXUSPROXY}/content/sites/raw" +USER=$(xpath -q -e \ "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE") -export OPENECOMP_NEXUS_PASSWORD=$(xpath -q -e \ +PASS=$(xpath -q -e \ "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE") -echo $OPENECOMP_NEXUS_RAW -echo $OPENECOMP_NEXUS_USER -echo $OPENECOMP_NEXUS_PASSWORD +# Create a netrc file for use with curl +export NETRC=$(mktemp) +echo "machine nexus.openecomp.org login ${USER} password ${PASS}" > "${NETRC}" + +echo $NEXUS_RAW export REPACKAGEDEBIANUPLOAD="set -x; curl -k \ - --user '${OPENECOMP_NEXUS_USER}:${OPENECOMP_NEXUS_PASSWORD}' \ + --netrc-file '${NETRC}' \ --upload-file '{0}' \ - '${OPENECOMP_NEXUS_RAW}/org.openecomp.dcae/deb-snapshots/{2}/{1}'" + '${NEXUS_RAW}/org.openecomp.dcae/deb-snapshots/{2}/{1}'" export REPACKAGEDEBIANUPLOAD2="set -x; curl -k \ - --user '${OPENECOMP_NEXUS_USER}:${OPENECOMP_NEXUS_PASSWORD}' \ + --netrc-file '${NETRC}' \ --upload-file '{0}' \ - '${OPENECOMP_NEXUS_RAW}/org.openecomp.dcae/deb-snapshots/{2}/{4}-LATEST.deb'" + '${NEXUS_RAW}/org.openecomp.dcae/deb-snapshots/{2}/{4}-LATEST.deb'" make debian echo "================= ENDING SCRIPT TO CREATE DEBIAN FILES =================" diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 5815ccf53..b324534a0 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -26,7 +26,7 @@ - maven-target: maven-version: 'mvn33' pom: '{pom}' - goals: 'clean deploy -B' + goals: 'clean deploy -B -P ${mvn-profile}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -42,7 +42,7 @@ - maven-target: maven-version: 'mvn33' pom: '{pom}' - goals: 'clean deploy -B' + goals: 'clean deploy -B -P ${mvn-profile}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index c2d24c162..7f0df0ed7 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -399,3 +399,5 @@ - maven-docker-push-daily: mvn-settings: '{mvn-settings}' pom: '{docker-pom}' + # use default as mvn-profile if profile is not needed + mvn-profile: '{mvn-profile}' diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 7404b7e74..90d6c9072 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -52,6 +52,7 @@ global-settings-file: 'global-settings' settings-file: '{mvn-settings}' - shell: | + #!/bin/bash virtualenv $WORKSPACE/venv-tox source $WORKSPACE/venv-tox/bin/activate pip install --upgrade pip diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml index 060df18ff..2628fecb1 100644 --- a/jjb/mso/mso.yaml +++ b/jjb/mso/mso.yaml @@ -8,7 +8,8 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-docker-java-daily': - docker-pom: './packages/docker/pom.xml' + docker-pom: 'pom.xml' + mvn-profile: 'docker' project: 'mso' stream: |