From a17bf04813fc134aec501ed56ab1106ce669eb3a Mon Sep 17 00:00:00 2001 From: Daniel Juarez Gonzalez Date: Thu, 30 Apr 2020 10:10:32 +0000 Subject: [PATCH] Update docs/distributions/cc7.md, docs/distributions/slc6.md files --- docs/distributions/cc7.md | 21 ++++----------------- docs/distributions/slc6.md | 21 ++++----------------- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/docs/distributions/cc7.md b/docs/distributions/cc7.md index dd341ad..94f85a6 100644 --- a/docs/distributions/cc7.md +++ b/docs/distributions/cc7.md @@ -105,7 +105,8 @@ yum clean --enablerepo=cern-testing,updates-testing all && yum update --enablere ``` Note: if you are testing a SIG package (cloud, virt, etc) then you will need to "--enablerepo=cloud-testing*" or similar -Send an email to `linux-announce-test@cern.ch` with updated packages information: +Send an email to `linux-announce-test@cern.ch` with updated packages information. This will as well add the updates to : + ``` /mnt/data2/home/build/bin/bsmailusers -d cc7 -r testing -e -s -w ``` @@ -165,28 +166,14 @@ yum clean all && yum update ## Update web pages & send email -To successfully update the web page, we need to first generate the html files which is actually done via the bsmailusers script. As we don't necessarily want to send the email before the www root has been updated, the below process should be followed: +The below process should be followed: run ``` /mnt/data2/home/build/bin/bsmailusers -d cc7 -r updates -e -s -w ``` -Update the subject line and copy this subject to a temporary location. Save the file and exit the editor, but do NOT send the email yet (the script will ask you if you wish to send) - -Update the web pages, new table blocks can be copied from the previous week. -Use the subject line that you copied previously as a title. Dates need to be updated. (this need better automation overall). -``` -vim /afs/cern.ch/project/linux/wwwtest/freshnews.shtml -``` - -Sync web page to production site [linux.web.cern.ch/linux](https://linux.web.cern.ch/linux/): -``` -/afs/cern.ch/project/linux/adm/bin/wwwtest2prod -``` -Double check the rendering looks fine - -Finally go back to your terminal that is still running the bsmailusers process and confirm 'yes' to send to send the mail. +Confirm 'yes' to send to send the mail. This will also [push an update automatically](https://gitlab.cern.ch/linuxsupport/websites/linux.cern.ch) that will end up showing on on ## 'Minor' (7.x -> 7.x+1) version release process. diff --git a/docs/distributions/slc6.md b/docs/distributions/slc6.md index 95f38d2..6f341ab 100644 --- a/docs/distributions/slc6.md +++ b/docs/distributions/slc6.md @@ -72,7 +72,7 @@ Test the upgrade works as expected on `lxvmslc6t-amd64` and `lxvmslc6t-i386`: yum clean all && yum update --enablerepo=slc6-testing ``` -Email `linux-announce-test@cern.ch` with updated packages information: +Email `linux-announce-test@cern.ch` with updated packages information. This will as well add the updates to : ``` /mnt/data2/home/build/bin/bsmailusers -d slc6 -r testing -e -s -w ``` @@ -122,25 +122,12 @@ yum clean all && yum update ## Update web pages & send email -To successfully update the web page, we need to first generate the html files which is actually done via the bsmailusers script. As we don't necessarily want to send the email before the www root has been updated, the below process should be followed: +The below process should be followed: run -``` -/mnt/data2/home/build/bin/bsmailusers -d slc6 -r updates -e -s -w -``` - -Update the subject line and copy this subject to a temporary location. Save the file and exit the editor, but do NOT send the email yet (the script will ask you if you wish to send) -Update the web pages, new table blocks can be copied from the previous week. -Use the subject line that you copied previously as a title. Dates need to be updated. (this need better automation overall). ``` -vim /afs/cern.ch/project/linux/wwwtest/freshnews.shtml -``` - -Sync web page to production site [linux.web.cern.ch/linux](https://linux.web.cern.ch/linux/): -``` -/afs/cern.ch/project/linux/adm/bin/wwwtest2prod +/mnt/data2/home/build/bin/bsmailusers -d slc6 -r updates -e -s -w ``` -Double check the rendering looks fine -Finally go back to your terminal that is still running the bsmailusers process and confirm 'yes' to send to send the mail. +Confirm 'yes' to send to send the mail. This will also [push an update automatically](https://gitlab.cern.ch/linuxsupport/websites/linux.cern.ch) that will end up showing on on -- GitLab