Update sdfabric-onos build with STC (#294)

* Update sdfabric-onos build with STC * Fix * Fix * Fix

Author: daniele-moro

.jenkins/Jenkinsfile

@@ -77,11 +77,11 @@ pipeline {
  dir("${env.WORKSPACE}/up4") {
  script {
  ONOS_IMAGE_STABLE = sh(
- script: "cat ../.env.stable | grep \'ONOS_IMAGE=\'| sed \'s/ONOS_IMAGE=//\'",
+ script: "bash -c 'cat .env.stable | grep \"ONOS_IMAGE=\"| sed \"s/ONOS_IMAGE=//\"'",
  returnStdout: true
  ).trim()
  if (ONOS_IMAGE_STABLE == "sdfabric-onos-local:master") {
- sh echo "SKIP UP4 build. UP4 is built as part of the scenarios deps step"
+ sh(script: 'echo "SKIP UP4 build. UP4 is built as part of the scenarios deps step"')
  skipUp4Build = true
  }
  }

scenarios/Makefile

@@ -31,7 +31,7 @@ include ../.env.stable
 endif
 
 # Used when building the sdfabric-onos image
-UP4_VERSION := $(shell git rev-parse --abbrev-ref HEAD)
+UP4_VERSION := $(shell git rev-parse HEAD)
 
 ifeq ($(ONOS_IMAGE),sdfabric-onos-local:master)
 BUILD_SDFABRIC_ONOS := true