mirror of https://github.com/kubernetes/kops.git
kubetest2-kops: get KOPS_BASE_URL in non-periodic jobs
Otherwise we're not using the version we just built
This commit is contained in:
parent
d90885e7b8
commit
7eda9a41c5
|
|
@ -18,7 +18,10 @@ package builder
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"sigs.k8s.io/kubetest2/pkg/exec"
|
"sigs.k8s.io/kubetest2/pkg/exec"
|
||||||
)
|
)
|
||||||
|
|
@ -39,5 +42,21 @@ func (b *BuildOptions) Build() error {
|
||||||
)
|
)
|
||||||
cmd.SetDir(b.KopsRoot)
|
cmd.SetDir(b.KopsRoot)
|
||||||
exec.InheritOutput(cmd)
|
exec.InheritOutput(cmd)
|
||||||
return cmd.Run()
|
if err := cmd.Run(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write some meta files so that other tooling can know e.g. KOPS_BASE_URL
|
||||||
|
metaDir := filepath.Join(b.KopsRoot, ".kubetest2")
|
||||||
|
|
||||||
|
if err := os.MkdirAll(metaDir, 0755); err != nil {
|
||||||
|
return fmt.Errorf("failed to Mkdir(%q): %w", metaDir, err)
|
||||||
|
}
|
||||||
|
p := filepath.Join(metaDir, "kops-base-url")
|
||||||
|
kopsBaseURL := strings.Replace(b.StageLocation, "gs://", "https://storage.googleapis.com/", 1)
|
||||||
|
if err := ioutil.WriteFile(p, []byte(kopsBaseURL), 0644); err != nil {
|
||||||
|
return fmt.Errorf("failed to WriteFile(%q): %w", p, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,9 @@ function kops-acquire-latest() {
|
||||||
fi
|
fi
|
||||||
$KUBETEST2 --build
|
$KUBETEST2 --build
|
||||||
KOPS="${REPO_ROOT}/.bazelbuild/dist/linux/amd64/kops"
|
KOPS="${REPO_ROOT}/.bazelbuild/dist/linux/amd64/kops"
|
||||||
|
KOPS_BASE_URL=$(cat "${REPO_ROOT}/.kubetest2/kops-base-url")
|
||||||
|
export KOPS_BASE_URL
|
||||||
|
echo "KOPS_BASE_URL=$KOPS_BASE_URL"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue