Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "3rd party ci: Create functest jobs for netvirt"
[releng.git]
/
jjb
/
apex
/
apex-upload-artifact.sh
diff --git
a/jjb/apex/apex-upload-artifact.sh
b/jjb/apex/apex-upload-artifact.sh
index
ba69f3e
..
64f13f4
100755
(executable)
--- a/
jjb/apex/apex-upload-artifact.sh
+++ b/
jjb/apex/apex-upload-artifact.sh
@@
-11,14
+11,22
@@
echo
# source the opnfv.properties to get ARTIFACT_VERSION
source $WORKSPACE/opnfv.properties
# source the opnfv.properties to get ARTIFACT_VERSION
source $WORKSPACE/opnfv.properties
+BUILD_DIRECTORY=${WORKSPACE}/.build
+
+# clone releng repository
+echo "Cloning releng repository..."
+[ -d releng ] && rm -rf releng
+git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng/ &> /dev/null
#this is where we import the siging key
#this is where we import the siging key
-source $WORKSPACE/releng/utils/gpg_import_key.sh
+if [ -f $WORKSPACE/releng/utils/gpg_import_key.sh ]; then
+ source $WORKSPACE/releng/utils/gpg_import_key.sh
+fi
signrpm () {
for artifact in $RPM_LIST $SRPM_LIST; do
echo "Signing artifact: ${artifact}"
signrpm () {
for artifact in $RPM_LIST $SRPM_LIST; do
echo "Signing artifact: ${artifact}"
- gpg2 -vvv --batch \
- --default-key opnfv-helpdesk@rt.linuxfoundation.org
\
+ gpg2 -vvv --batch
--yes --no-tty
\
+ --default-key opnfv-helpdesk@rt.linuxfoundation.org \
--passphrase besteffort \
--detach-sig $artifact
gsutil cp "$artifact".sig gs://$GS_URL/$(basename "$artifact".sig)
--passphrase besteffort \
--detach-sig $artifact
gsutil cp "$artifact".sig gs://$GS_URL/$(basename "$artifact".sig)
@@
-27,9
+35,9
@@
done
}
signiso () {
}
signiso () {
-time gpg2 -vvv --batch \
+time gpg2 -vvv --batch
--yes --no-tty
\
--default-key opnfv-helpdesk@rt.linuxfoundation.org \
--default-key opnfv-helpdesk@rt.linuxfoundation.org \
- --passphrase
notreallysecure
\
+ --passphrase
besteffort
\
--detach-sig $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso
gsutil cp $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig
--detach-sig $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso
gsutil cp $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig
@@
-43,13
+51,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-//')
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 o
pendaylight-sfc o
nos; 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-//')
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 o
pendaylight-sfc o
nos; do
+for pkg in common undercloud onos; do
SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
}
SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
}