diff --git a/docs/devenv_setup.md b/docs/devenv_setup.md index 3e67323842..46d3ce2a13 100644 --- a/docs/devenv_setup.md +++ b/docs/devenv_setup.md @@ -4,7 +4,7 @@ It is recommended to review the current document and use the automation instruct ## Create Development Virtual Machine Start by downloading one of the supported boot images for the `x86_64` or `aarch64` architecture: -* RHEL 9.1 from https://developers.redhat.com/products/rhel/download +* RHEL 9.2 from https://developers.redhat.com/products/rhel/download * CentOS 9 Stream from https://www.centos.org/download ### Creating VM @@ -66,19 +66,6 @@ sudo dnf clean all -y sudo dnf update -y sudo dnf install -y git cockpit make golang selinux-policy-devel rpm-build jq bash-completion sudo systemctl enable --now cockpit.socket - -# Install go1.19 -# This is installed into different location (/usr/local/bin/go) from dnf installed Go (/usr/bin/go) so it doesn't conflict -# /usr/local/bin is before /usr/bin in $PATH so newer one is picked up -GO_VER=1.19.4 -GO_ARCH=$([ "$(uname -i)" == "x86_64" ] && echo "amd64" || echo "arm64") -curl -L -o "go${GO_VER}.linux-${GO_ARCH}.tar.gz" "https://go.dev/dl/go${GO_VER}.linux-${GO_ARCH}.tar.gz" && - sudo rm -rf "/usr/local/go${GO_VER}" && \ - sudo mkdir -p "/usr/local/go${GO_VER}" && \ - sudo tar -C "/usr/local/go${GO_VER}" -xzf "go${GO_VER}.linux-${GO_ARCH}.tar.gz" --strip-components 1 && \ - sudo rm -rfv /usr/local/bin/{go,gofmt} && \ - sudo ln --symbolic /usr/local/go${GO_VER}/bin/{go,gofmt} /usr/local/bin/ && \ - rm -rfv "go${GO_VER}.linux-${GO_ARCH}.tar.gz" ``` You should now be able to access the VM Cockpit console using `https://:9090` URL. diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index 1664bd10ad..aadce55a1b 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -9,7 +9,7 @@ } # golang specifics -%global golang_version 1.18 +%global golang_version 1.19 #debuginfo not supported with Go %global debug_package %{nil} # modifying the Go binaries breaks the DWARF debugging @@ -296,6 +296,9 @@ systemctl enable --now --quiet openvswitch || true # Use Git command to generate the log and replace the VERSION string # LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec %changelog +* Wed Mar 29 2023 Gregory Giguashvili 4.13.0 +- Upgrade golang build-time dependency to 1.19 version + * Wed Mar 01 2023 Gregory Giguashvili 4.13.0 - Add lvmd.yaml and ovn.yaml default configuration files diff --git a/scripts/devenv-builder/configure-vm.sh b/scripts/devenv-builder/configure-vm.sh index 3066a6b29f..2982daff04 100755 --- a/scripts/devenv-builder/configure-vm.sh +++ b/scripts/devenv-builder/configure-vm.sh @@ -72,19 +72,6 @@ if $INSTALL_BUILD_DEPS || $BUILD_AND_RUN; then sudo dnf update -y sudo dnf install -y git cockpit make golang jq selinux-policy-devel rpm-build jq bash-completion sudo systemctl enable --now cockpit.socket - - # Install go1.19 - # This is installed into different location (/usr/local/bin/go) from dnf installed Go (/usr/bin/go) so it doesn't conflict - # /usr/local/bin is before /usr/bin in $PATH so newer one is picked up - GO_VER=1.19.4 - GO_ARCH=$([ "$(uname -i)" == "x86_64" ] && echo "amd64" || echo "arm64") - curl -L -o "go${GO_VER}.linux-${GO_ARCH}.tar.gz" "https://go.dev/dl/go${GO_VER}.linux-${GO_ARCH}.tar.gz" && - sudo rm -rf "/usr/local/go${GO_VER}" && - sudo mkdir -p "/usr/local/go${GO_VER}" && - sudo tar -C "/usr/local/go${GO_VER}" -xzf "go${GO_VER}.linux-${GO_ARCH}.tar.gz" --strip-components 1 && - sudo rm -rfv /usr/local/bin/{go,gofmt} && - sudo ln --symbolic /usr/local/go${GO_VER}/bin/{go,gofmt} /usr/local/bin/ && - rm -rfv "go${GO_VER}.linux-${GO_ARCH}.tar.gz" fi if $BUILD_AND_RUN; then diff --git a/scripts/image-builder/configure.sh b/scripts/image-builder/configure.sh index d665ea327f..22624ccd29 100755 --- a/scripts/image-builder/configure.sh +++ b/scripts/image-builder/configure.sh @@ -3,10 +3,59 @@ set -exo pipefail OSVERSION=$(awk -F: '{print $5}' /etc/system-release-cpe) +function osbuild_rhel9_beta() { + local json_file=$1 + sudo mkdir -p $(dirname ${json_file}) + sudo tee ${json_file} >/dev/null <