diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-10-20 11:23:32 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-10-20 11:23:32 -0400 |
| commit | 20a77c5723bda065d50522682d78985c604a4d44 (patch) | |
| tree | 478bf45e050e21ef372120015b7e1313bdb47e69 | |
| parent | 647a7cbab0d198894a9b55d9412ffdbf19780470 (diff) | |
Apex: removes opendaylight-sfc rpm from upload
We no longer build a separate RPM for opendaylight-sfc, so this needs to
be removed.
Change-Id: I6dc10d4dbc1c42336f299e4b05955e95a67bb1a0
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 2 | ||||
| -rwxr-xr-x | jjb/apex/apex-upload-artifact.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 72fa6f6f0..e21387ac6 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -3,7 +3,7 @@ set -o errexit set -o nounset set -o pipefail -APEX_PKGS="common undercloud opendaylight-sfc onos" +APEX_PKGS="common undercloud onos" IPV6_FLAG=False # log info to console diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh index 0dd112bc8..f54e4c55a 100755 --- a/jjb/apex/apex-upload-artifact.sh +++ b/jjb/apex/apex-upload-artifact.sh @@ -49,13 +49,13 @@ echo "ISO Upload Complete!" 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 opendaylight-sfc onos; do +for pkg in common undercloud onos; do 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 opendaylight-sfc onos; do +for pkg in common undercloud onos; do SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}" done } |