From 28cc4ed8dc0f0dbce9b094deee9c748d8789c4b3 Mon Sep 17 00:00:00 2001 From: Matt Wrock Date: Fri, 22 Nov 2024 14:09:17 -0800 Subject: [PATCH] updating release doc to remove linux kernel2 Signed-off-by: Matt Wrock --- RELEASE.md | 102 +++++------------- .../x86_64-linux-kernel2/Vagrantfile | 35 ------ 2 files changed, 29 insertions(+), 108 deletions(-) delete mode 100644 support/validation/x86_64-linux-kernel2/Vagrantfile diff --git a/RELEASE.md b/RELEASE.md index aee4224f17..d1612754ae 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -27,7 +27,6 @@ new packages coming in and invalidating your efforts. For each platform ([darwin](https://packages.chef.io/files/staging/habitat/latest/hab-x86_64-darwin.zip), [linux](https://packages.chef.io/files/staging/habitat/latest/hab-x86_64-linux.tar.gz), -[linux-kernel2](https://packages.chef.io/files/staging/habitat/latest/hab-x86_64-linux-kernel2.tar.gz), [windows](https://packages.chef.io/files/staging/habitat/latest/hab-x86_64-windows.zip)), download the latest release candidate CLI from `packages.chef.io`. You **must** have run the `/expeditor` Slack command above _before_ @@ -53,21 +52,6 @@ curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/ sudo hab pkg install core/hab --binlink --force --channel=staging ``` -#### Linux, Kernel 2 - -Run either of the following commands: - -``` sh -curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh \ - | sudo bash -s -- -c staging -t x86_64-linux-kernel2 -``` -(Note the addition of the target option on the "curlbash" command! Without this you will end up with -the modern Linux version, and things won't work properly!) - -```sh -sudo hab pkg install core/hab --binlink --force --channel=staging -``` - #### macOS ``` sh @@ -120,7 +104,9 @@ Here is how you can validate the version of the cli, supervisor and the supervis On Linux: ``` sh hab --version -hab sup --version +sudo -E hab sup --version + +hab studio rm hab studio enter hab --version sup-log @@ -133,6 +119,7 @@ On Windows: ``` pwsh hab --version hab sup --version +hab studio rm hab studio enter hab --version Get-Supervisorlog @@ -158,81 +145,50 @@ hab studio enter ``` Then, once inside the Studio, you could try these: +On Linux: + ``` sh # Does the version of the cli inside the studio match staging? hab --version # Does the version of the supervisor inside the studio match staging? sup-log ^C -# build the apache plan -build core-plans/httpd +# build the redis plan +build core-plans/redis source results/last_build.env hab svc load $pkg_ident sup-log -# Is Apache running +# Is redis running and accepting connections ^C +# Is it connectable? +hab pkg exec $pkg_ident redis-cli --stat +``` + +On Windows: +``` sh +# Does the version of the cli inside the studio match staging? +hab --version +# Does the version of the supervisor inside the studio match staging? +# The supervisor log will come up in a different window in a non-docker +# Windows Studio. Make sure to "accept" any windows firewall requests. +Get-SupervisorLog +# build the nginx plan +build core-plans/nginx +. results/last_build.ps1 +hab svc load $pkg_ident +# Look at the log window to see if nginx running # Is it responding? -hab pkg exec core/busybox-static wget http://localhost -S +Invoke-WebRequest http://localhost ``` -On Linux, testing the Docker studio is identical, except you enter +Testing the Docker studio is identical, except you enter using the following command instead: ```sh hab studio enter -D ``` -Test both in the chroot and docker studios on x86 linux. - -### Validating x86_64-linux-kernel2 - -For this PackageTarget it is important that you perform validation on a Linux system running a 2.6 series kernel. CentOS 6 is recommended because it ships with a kernel of the appropriate age, but any distro with a Kernel between 2.6.32 and 3.0.0 can be used. Included in the `support/validation/x86_64-linux-kernel2` directory in this repository is a Vagrantfile that will create a CentOS-6 VM to perform the validation. You can also run a VM in EC2. - -The Vagrantfile is configured to grab the -[core-plans](https://github.com/habitat-sh/core-plans) repository (to -give you something to build), as well as grab the secret key for your -`HAB_ORIGIN` (using the `HAB_ORIGIN` and `HAB_AUTH_TOKEN` variables in -your environment). Additionally, it will automatically install the -release candidate `hab` binary from the `staging` channel unless you -explicitly override that with the `INSTALL_CHANNEL` variable (see below). - - -```sh -export HAB_ORIGIN=... -export HAB_AUTH_TOKEN=... - -# Only if you *don't* want the staging artifact, for some reason -export INSTALL_CHANNEL=... - -vagrant up -vagrant ssh -``` -Once inside the VM, set your override environment variables (as above) -and experiment. For example: - -```sh -export HAB_INTERNAL_BLDR_CHANNEL=staging -export HAB_STUDIO_SECRET_HAB_INTERNAL_BLDR_CHANNEL=staging -export HAB_ORIGIN= -hab studio enter -``` - -Then, once inside the Studio, you could try these: - -``` sh -# Does the version of the cli inside the studio match staging? -hab --version -# Does the version of the supervisor inside the studio match staging? -sup-log -^C -# build the apache plan -build core-plans/redis -source results/last_build.env -hab svc load $pkg_ident -sup-log -# Is Redis running and reporting "Ready to accept connections" -^C -``` +Test both in the native and docker studios on x86 linux and windows. ## Promote from Staging to Current diff --git a/support/validation/x86_64-linux-kernel2/Vagrantfile b/support/validation/x86_64-linux-kernel2/Vagrantfile deleted file mode 100644 index 9a0d510ed3..0000000000 --- a/support/validation/x86_64-linux-kernel2/Vagrantfile +++ /dev/null @@ -1,35 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : -Vagrant.configure("2") do |config| - config.vm.box = "bento/centos-6.10" - config.vm.box_check_update = false - - config.vm.provider "virtualbox" do |vb| - vb.memory = "2048" - end - - config.vm.provision "shell", inline: <<-SHELL - yum install -y wget curl git - - # You'll need this for running most services - adduser hab - - # You'll want this if you want to build a plan - git clone https://github.com/habitat-sh/core-plans.git - - # You'll also want the keys for building for whatever origin you - # choose. - # - # It expects you to have HAB_ORIGIN and HAB_AUTH_TOKEN set in your - # environment when you provision the VM. - # - # Additionally, it will install from the *staging* channel unless - # you specifically override this with the INSTALL_CHANNEL environment - # variable. This is the default because this VM is mostly used for - # manual evaluation of release candidates from that channel. - curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh -o install.sh - bash install.sh -t x86_64-linux-kernel2 -c #{ENV.fetch('INSTALL_CHANNEL', 'staging')} - sudo hab license accept - sudo -u vagrant hab origin key download #{ENV['HAB_ORIGIN']} --secret --auth=#{ENV['HAB_AUTH_TOKEN']} - SHELL -end