X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=af54d237462701ba9e1b890412093350c493b114;hb=00ee6025d0bcd56f5a55f06c76c97cc864534b20;hp=cf73abe9dd2689c5f5e72b045ab5ac97bbd22ac3;hpb=f7a30428cfbbbb678f09fae5a430636ba3e64712;p=icn.git

diff --git a/env/lib/common.sh b/env/lib/common.sh
index cf73abe..af54d23 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -27,11 +27,11 @@ KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
 KUD_VERSION="8157bf63753839ce4e9006978816fad3f63ca2de"
 
 #EMCO repository URL
-EMCOREPO="${EMCOREPO:-https://github.com/open-ness/EMCO.git}"
+EMCOREPO="${EMCOREPO:-https://gitlab.com/project-emco/core/emco-base.git}"
 #Path to clone the EMCO repo
-EMCOPATH="/opt/src/github.com/open-ness/EMCO"
+EMCOPATH="/opt/src/emco-base"
 #EMCO version to use
-EMCO_VERSION="openness-21.03.06"
+EMCO_VERSION="v21.12"
 
 #Discard existing repo directory
 FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-false}"
@@ -46,7 +46,7 @@ CAPI_VERSION="v0.4.3"
 CAPM3_VERSION="v0.5.1"
 
 #The flux version to use
-FLUX_VERSION="0.20.0"
+FLUX_VERSION="0.25.3"
 
 #The sops version to use
 SOPS_VERSION="v3.7.1"
@@ -274,40 +274,6 @@ 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
-    sudo install -o root -g root -m 0755 kustomize /usr/local/bin/kustomize
-    rm kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz kustomize
-    kustomize version
-}
-
-function install_clusterctl {
-    curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/clusterctl-linux-amd64 -o clusterctl
-    sudo install -o root -g root -m 0755 clusterctl /usr/local/bin/clusterctl
-    rm clusterctl
-    clusterctl version
-}
-
-function install_flux_cli {
-    export FLUX_VERSION
-    curl -s https://fluxcd.io/install.sh | sudo -E bash
-    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 install_sops {
-    curl -L https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops-${SOPS_VERSION}.linux -o sops
-    sudo install -o root -g root -m 0755 sops /usr/local/bin/sops
-    rm sops
-    sops --version
-}
-
 function fetch_image {
     if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
        mkdir -p "${IRONIC_DATA_DIR}/html/images"