summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-04-16 20:24:30 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-04-16 20:24:30 +0200
commit854caaf3a8c0e3f1bd8dbf648313168ea32b21c9 (patch)
treed0bd16b0e30fab18a913cfa894137de27f4e4b91
parent38cb2c967ec8bd8a3d2817cce076fad607bb5040 (diff)
Store md5sums in properties file and enable fuel quick deploy
JIRA: OCTO-3 Change-Id: I2c9eafddf3f0bf5b5420342d280e50aceedf9878 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/genesis/genesis-foreman.yml1
-rw-r--r--jjb/genesis/genesis-fuel.yml43
2 files changed, 7 insertions, 37 deletions
diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index c63b42396..5c2ec99a9 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -302,6 +302,7 @@
echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$BUILD_ID.iso"
+ echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum opnfv-$ARTIFACT_VERSION.iso | cut -d' ' -f1)"
echo "OPNFV_BUILD_URL=$BUILD_URL"
echo "OPNFV_BUILD=OK"
) > opnfv-$BUILD_ID.properties
diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index c9018750d..fe6316c3f 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -227,12 +227,7 @@
builders:
- 'installer-build'
- - 'installer-upload-artifact'
- - 'installer-download-artifact'
- - 'installer-deploy'
- - 'installer-test'
- - 'installer-cleanup'
-
+ - 'installer-deploy-quick-fix'
- builder:
name: installer-build
@@ -255,7 +250,7 @@
ls -al $BUILD_DIRECTORY
- builder:
- name: installer-deploy
+ name: installer-deploy-quick-fix
builders:
- shell: |
#!/bin/bash
@@ -264,36 +259,9 @@
set -o pipefail
set -x
- # we should have the artifact itself downloaded by now
- # look if it is there
- if [ -f $WORKSPACE/opnfv.iso ]; then
- echo "Artifact fetched!"
- ls -al $WORKSPACE/opnfv.iso
- else
- echo "Artifact does not exist!"
- exit 1
- fi
-
- # we should have the artifact properties file downloaded by now
- # look if it is there
- if [ -f $WORKSPACE/latest.properties ]; then
- echo "Artifact properties file fetched!"
- ls -al $WORKSPACE/latest.properties
- else
- echo "Artifact properties file does not exist!"
- exit 1
- fi
-
- # source the file so we get OPNFV vars
- source $WORKSPACE/latest.properties
-
- # log the info
- echo "Proceeding with deployment using ISO downloaded from below URL"
- echo "$OPNFV_ARTIFACT_URL"
- echo "This artifact was built using $OPNFV_GIT_SHA1 version of repo $OPNFV_GIT_URL"
-
- # execute deploy.sh
- echo "Here is where we are supposed to issue deploy.sh"
+ # this is just a quick fix to execute the deployment in a messy way
+ # will be fixed later on
+ ssh cideploy@10.118.34.205 ./cideploy.sh
- builder:
name: installer-test
@@ -326,6 +294,7 @@
echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$ARTIFACT_VERSION.iso"
+ echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum opnfv-$ARTIFACT_VERSION.iso | cut -d' ' -f1)"
echo "OPNFV_BUILD_URL=$BUILD_URL"
echo "OPNFV_BUILD=OK"
) > opnfv-$ARTIFACT_VERSION.properties