diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-04-23 21:06:39 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-04-23 21:06:39 -0400 |
| commit | dae7719231115b7169a4e0feb02bde194ca8252a (patch) | |
| tree | 2ee880f3180ef4eb7f72cae62d766aecf893fdc3 | |
| parent | c9b1f1194dbe6c050010fcc9e3188835f35a83ea (diff) | |
Apex: fixes iso verify/upload
Change-Id: I25baff8b74bf26903e5196f31b9f47dab94fd048
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/apex/apex-upload-artifact.sh | 47 |
1 files changed, 26 insertions, 21 deletions
diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh index eefc683a6..d046c119d 100755 --- a/jjb/apex/apex-upload-artifact.sh +++ b/jjb/apex/apex-upload-artifact.sh @@ -55,19 +55,6 @@ uploadiso () { } uploadrpm () { - RPM_INSTALL_PATH=$BUILD_DIRECTORY/noarch - RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL) - VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//') - for pkg in common undercloud; do # removed onos for danube - RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}" - done - SRPM_INSTALL_PATH=$BUILD_DIRECTORY - SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL) - VERSION_EXTENSION=$(echo $(basename $OPNFV_SRPM_URL) | sed 's/opnfv-apex-//') - for pkg in common undercloud; do # removed onos for danube - SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}" - done - for artifact in $RPM_LIST $SRPM_LIST; do echo "Uploading artifact: ${artifact}" gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.iso.log @@ -88,21 +75,39 @@ uploadsnap () { echo "Upload complete for Snapshot" } +if gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then + echo "Signing Key avaliable" + SIGN_ARTIFACT="true" +fi + if [ "$ARTIFACT_TYPE" == 'snapshot' ]; then uploadsnap -elif gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then - echo "Signing Key avaliable" - if [ "$ARTIFACT_TYPE" == 'iso' ]; then +elif [ "$ARTIFACT_TYPE" == 'iso' ]; then + if [[ -n "$SIGN_ARTIFACT" && "$SIGN_ARTIFACT" == "true" ]]; then signiso - uploadiso fi - if [ "$ARTIFACT_TYPE" == 'rpm' ]; then + uploadiso +elif [ "$ARTIFACT_TYPE" == 'rpm' ]; then + RPM_INSTALL_PATH=$BUILD_DIRECTORY/noarch + RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL) + VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//') + for pkg in common undercloud; do # removed onos for danube + RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}" + done + SRPM_INSTALL_PATH=$BUILD_DIRECTORY + SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL) + VERSION_EXTENSION=$(echo $(basename $OPNFV_SRPM_URL) | sed 's/opnfv-apex-//') + for pkg in common undercloud; do # removed onos for danube + SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}" + done + + if [[ -n "$SIGN_ARTIFACT" && "$SIGN_ARTIFACT" == "true" ]]; then signrpm - uploadrpm fi + uploadrpm else - if [ "$ARTIFACT_TYPE" == 'iso' ]; then uploadiso; fi - if [ "$ARTIFACT_TYPE" == 'rpm' ]; then uploadrpm; fi + echo "ERROR: Unknown artifact type ${ARTIFACT_TYPE} to upload...exiting" + exit 1 fi echo |