Merge "Update provisioned OS to Ubuntu 20.04"

diff --combined env/lib/common.sh
index 052c3ea,56d19ba..809e67f
--- 1/env/lib/common.sh
--- 2/env/lib/common.sh
+++ b/env/lib/common.sh
@@@ -1,14 -1,16 +1,14 @@@
  #!/usr/bin/env bash
  set -eu -o pipefail
  
 -DOWNLOAD_PATH=${DOWNLOAD_PATH:-/opt/icn}
 -
  IRONIC_DATA_DIR=${IRONIC_DATA_DIR:-"/opt/ironic"}
  #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it
  IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
  IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
  IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
  IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1"}
- BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img"}
- BM_IMAGE=${BM_IMAGE:-"bionic-server-cloudimg-amd64.img"}
+ BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"}
+ BM_IMAGE=${BM_IMAGE:-"focal-server-cloudimg-amd64.img"}
  
  #Baremetal operator repository URL
  BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
@@@ -16,22 -18,7 +16,22 @@@
  BMOPATH="/opt/src/github.com/metal3-io/baremetal-operator"
  #Bare Metal Operator version to use
  BMO_VERSION="capm3-v0.5.1"
 -#Discard existing baremetal operator repo directory
 +
 +#KuD repository URL
 +KUDREPO="${KUDREPO:-https://github.com/onap/multicloud-k8s.git}"
 +#Path to clone the KuD repo
 +KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
 +#KuD version to use
 +KUD_VERSION="ed96bca7fe415f1636d82c26af15d7474bdfe876"
 +
 +#EMCO repository URL
 +EMCOREPO="${EMCOREPO:-https://github.com/open-ness/EMCO.git}"
 +#Path to clone the EMCO repo
 +EMCOPATH="/opt/src/github.com/open-ness/EMCO"
 +#EMCO version to use
 +EMCO_VERSION="openness-21.03.06"
 +
 +#Discard existing repo directory
  FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-true}"
  
  # The kustomize version to use
@@@ -184,40 -171,25 +184,40 @@@ function wait_for 
      done
  }
  
 -function clone_baremetal_operator_repository {
 -    mkdir -p $(dirname ${BMOPATH})
 -    if [[ -d ${BMOPATH} && "${FORCE_REPO_UPDATE}" == "true" ]]; then
 -       rm -rf "${BMOPATH}"
 +function clone_repository {
 +    local -r path=$1
 +    local -r repo=$2
 +    local -r version=$3
 +    mkdir -p $(dirname ${path})
 +    if [[ -d ${path} && "${FORCE_REPO_UPDATE}" == "true" ]]; then
 +       rm -rf "${path}"
      fi
 -    if [ ! -d "${BMOPATH}" ] ; then
 -        pushd $(dirname ${BMOPATH})
 -        git clone "${BMOREPO}"
 +    if [ ! -d "${path}" ] ; then
 +        pushd $(dirname ${path})
 +        git clone "${repo}"
          popd
      else
 -       pushd "${BMOPATH}"
 +       pushd "${path}"
         git fetch
         popd
      fi
 -    pushd "${BMOPATH}"
 -    git reset --hard "${BMO_VERSION}"
 +    pushd "${path}"
 +    git reset --hard "${version}"
      popd
  }
  
 +function clone_baremetal_operator_repository {
 +    clone_repository ${BMOPATH} ${BMOREPO} ${BMO_VERSION}
 +}
 +
 +function clone_kud_repository {
 +    clone_repository ${KUDPATH} ${KUDREPO} ${KUD_VERSION}
 +}
 +
 +function clone_emco_repository {
 +    clone_repository ${EMCOPATH} ${EMCOREPO} ${EMCO_VERSION}
 +}
 +
  function install_kustomize {
      curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" -o kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
      tar xzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --no-same-owner
@@@ -239,12 -211,6 +239,12 @@@ function install_flux_cli 
      flux --version
  }
  
 +function install_emcoctl {
 +    clone_emco_repository
 +    make -C ${EMCOPATH}/src/tools/emcoctl
 +    sudo install -o root -g root -m 0755 ${EMCOPATH}/bin/emcoctl/emcoctl /usr/local/bin/emcoctl
 +}
 +
  function fetch_image {
      if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
         mkdir -p "${IRONIC_DATA_DIR}/html/images"