From 0ec281d601903df73f1421b8763f06c0c147ac64 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 26 May 2021 17:31:02 +0200 Subject: [PATCH 1/2] Update test procedure for Release TEN Signed-off-by: garciadeblas --- 01-test-environment.md | 83 ++++++++++++++-------------------------- 02-osm-nfvi-test-plan.md | 50 +++++------------------- 2 files changed, 38 insertions(+), 95 deletions(-) diff --git a/01-test-environment.md b/01-test-environment.md index 03ef202..d8c1ece 100644 --- a/01-test-environment.md +++ b/01-test-environment.md @@ -12,73 +12,46 @@ This is the recommended installation procedure for general OSM users. For a step-by-step procedure, please refer to this chapter of the [User Guide](https://osm.etsi.org/docs/user-guide/03-installing-osm.html) to build the latest stable release. -For the time being, Rel SEVEN 7.1.4 is the latest stable OSM release. +For the time being, Rel NINE 9.1.1 is the latest stable OSM release. ### New release candidate -New release candidates can be tested using the installer with the following options (e.g. RC1 for Rel EIGHT): - -- For an installation based on Docker Swarm: - ```bash - DOCKER_TAG=8.0.0rc1 - REPO_BASE=8.0.0rc1 - REPO_NAME=testing - wget http://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh - ./install_osm.sh -t ${DOCKER_TAG} -r ${REPO_NAME} -R ${REPO_BASE} -y - ``` -- For an installation based on K8s: - ```bash - DOCKER_TAG=8.0.0rc1 - REPO_BASE=8.0.0rc1 - REPO_NAME=testing - wget http://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh - ./install_osm.sh -t ${DOCKER_TAG} -r ${REPO_NAME} -R ${REPO_BASE} -y -c k8s - ``` +New release candidates can be tested using the installer with the following options (e.g. RC1 for Rel TEN): + +```bash +DOCKER_TAG=10.0.0rc1 +REPO_BASE=10.0.0rc1 +REPO_NAME=testing +wget http://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh +./install_osm.sh -t ${DOCKER_TAG} -r ${REPO_NAME} -R ${REPO_BASE} -y +``` ### Daily builds -Daily builds of branches EIGHT, SEVEN, and master can be installed by using the appropriate installer options. +Daily builds of branches TEN, NINE and master can be installed by using the appropriate installer options. These builds include the latest community contributions and may contain bugs. Therefore they are only recommended for developers and contributors involved in community testing. -#### Release EIGHT daily - -- For an installation based on Docker Swarm: - ```bash - wget http://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh - ./install_osm.sh -R ReleaseEIGHT-daily -t releaseeight-daily -r testing -y - ``` -- For an OSM installation on top of K8s (it should be functionally identical): - ```bash - wget http://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh - ./install_osm.sh -R ReleaseEIGHT-daily -t releaseeight-daily -r testing -y -c k8s - ``` - -#### Release SEVEN daily - -- For an installation based on Docker Swarm: - ```bash - wget https://osm-download.etsi.org/ftp/osm-7.0-seven/install_osm.sh - ./install_osm.sh -R ReleaseSEVEN-daily -t releaseseven-daily -r testing -y - ``` -- For an OSM installation on top of K8s (it should be functionally identical): - ```bash - wget https://osm-download.etsi.org/ftp/osm-7.0-seven/install_osm.sh - ./install_osm.sh -R ReleaseSEVEN-daily -t releaseseven-daily -r testing -y -c k8s - ``` +#### Release TEN daily + +```bash +wget http://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh +./install_osm.sh -R ReleaseTEN-daily -t releaseten-daily -r testing -y +``` + +#### Release NINE daily + +```bash +wget https://osm-download.etsi.org/ftp/osm-9.0-seven/install_osm.sh +./install_osm.sh -R ReleaseNINE-daily -t releasenine-daily -r testing -y +``` #### `master` branch daily -- For an installation based on Docker Swarm: - ```bash - wget http://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh - ./install_osm.sh -R testing-daily -t testing-daily -r testing -y - ``` -- For an OSM installation on top of K8s (it should be functionally identical): - ```bash - wget http://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh - ./install_osm.sh -R testing-daily -t testing-daily -r testing -y -c k8s - ``` +```bash +wget http://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh +./install_osm.sh -R testing-daily -t testing-daily -r testing -y -c k8s +``` ## Performing the tests diff --git a/02-osm-nfvi-test-plan.md b/02-osm-nfvi-test-plan.md index 33dcdf8..6bd6dba 100644 --- a/02-osm-nfvi-test-plan.md +++ b/02-osm-nfvi-test-plan.md @@ -35,14 +35,9 @@ These tests assume that the VIM meets the following conditions: In addition, the following images are needed for the tests, and must be uploaded to the corresponding VIM before the test starts: -- `ubuntu16.04`: [xenial-server-cloudimg-amd64-disk1.img](https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img) - `ubuntu18.04`: [bionic-server-cloudimg-amd64.img](https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img) -- `cirros`: [cirros-0.5.1-x86_64-disk.img](http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img) -- `US1604`: [US1604.qcow2](https://osm-download.etsi.org/ftp/images/tests/US1604.qcow2) -- `hackfest-pktgen`: [hackfest-pktgen.qcow2](https://osm-download.etsi.org/ftp/images/tests/hackfest-pktgen.qcow2) -- `sfc_nsh_fraser`: [sfc_nsh_fraser.qcow2](https://osm-download.etsi.org/ftp/images/tests/sfc_nsh_fraser.qcow2) -- `intel_vbng34`: [intel_vbng34.qcow2](https://osm-download.etsi.org/ftp/images/tests/intel_vbng34.qcow2) -- `intel_vbng_gen`: [intel_gen.qcow2](https://osm-download.etsi.org/ftp/images/tests/intel_gen.qcow2) +- `ubuntu20.04`: [focal-server-cloudimg-amd64.img](https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img) +- `cirros-0.3.5-x86_64-disk.img`: [cirros-0.3.5-x86_64-disk.img](http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img) - `vyos-1.1.7`: [vyos-1.1.7-cloudinit.qcow2](https://osm-download.etsi.org/ftp/images/tests/vyos-1.1.7-cloudinit.qcow2) In the case of OpenStack VIMs, they can be uploaded following this procedure: @@ -52,45 +47,20 @@ DISK_FORMAT=qcow2 #DISK_FORMAT=vmdk # For VIO, use this format instead of qcow2 # Test images -openstack image show cirros >/dev/null 2>&1 || \ -wget http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img && \ -openstack image create --disk-format $DISK_FORMAT --public --file cirros-0.5.1-x86_64-disk.img cirros && \ -rm cirros-0.5.1-x86_64-disk.img +openstack image show cirros-0.3.5-x86_64-disk.img >/dev/null 2>&1 || \ +wget http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img && \ +openstack image create --disk-format $DISK_FORMAT --public --file cirros-0.3.5-x86_64-disk.img cirros-0.3.5-x86_64-disk.img && \ +rm cirros-0.3.5-x86_64-disk.img openstack image show ubuntu18.04 >/dev/null 2>&1 || \ wget https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img && \ openstack image create --disk-format $DISK_FORMAT --public --file bionic-server-cloudimg-amd64.img ubuntu18.04 && \ rm bionic-server-cloudimg-amd64.img -openstack image show ubuntu16.04 >/dev/null 2>&1 || \ -wget https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img && \ -openstack image create --disk-format $DISK_FORMAT --public --file xenial-server-cloudimg-amd64-disk1.img ubuntu16.04 && \ -rm xenial-server-cloudimg-amd64-disk1.img - -openstack image show US1604 >/dev/null 2>&1 || \ -wget https://osm-download.etsi.org/ftp/images/tests/US1604.qcow2 && \ -openstack image create --disk-format $DISK_FORMAT --public --file US1604.qcow2 US1604 && \ -rm US1604.qcow2 - -openstack image show hackfest-pktgen >/dev/null 2>&1 || \ -wget https://osm-download.etsi.org/ftp/images/tests/hackfest-pktgen.qcow2 && \ -openstack image create --disk-format $DISK_FORMAT --public --file hackfest-pktgen.qcow2 hackfest-pktgen && \ -rm hackfest-pktgen.qcow2 - -openstack image show sfc_nsh_fraser >/dev/null 2>&1 || \ -wget https://osm-download.etsi.org/ftp/images/tests/sfc_nsh_fraser.qcow2 && \ -openstack image create --disk-format $DISK_FORMAT --public --file sfc_nsh_fraser.qcow2 sfc_nsh_fraser && \ -rm sfc_nsh_fraser.qcow2 - -openstack image show intel_vbng34 >/dev/null 2>&1 || \ -wget https://osm-download.etsi.org/ftp/images/tests/intel_vbng34.qcow2 && \ -openstack image create --disk-format $DISK_FORMAT --public --file intel_vbng34.qcow2 intel_vbng34 && \ -rm intel_vbng34.qcow2 - -openstack image show intel_vbng_gen >/dev/null 2>&1 || \ -wget https://osm-download.etsi.org/ftp/images/tests/intel_gen.qcow2 && \ -openstack image create --disk-format $DISK_FORMAT --public --file intel_gen.qcow2 intel_vbng_gen && \ -rm intel_gen.qcow2 +openstack image show ubuntu20.04 >/dev/null 2>&1 || \ +wget https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img&& \ +openstack image create --disk-format $DISK_FORMAT --public --file focal-server-cloudimg-amd64.img ubuntu20.04 && \ +rm focal-server-cloudimg-amd64.img openstack image show vyos-1.1.7 >/dev/null 2>&1 || \ wget https://osm-download.etsi.org/ftp/images/tests/vyos-1.1.7-cloudinit.qcow2 && \ -- GitLab From 5972dea31662b787e83ad921d11dad090629b3e6 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 26 May 2021 17:35:54 +0200 Subject: [PATCH 2/2] Minor updates to installation procedure Signed-off-by: garciadeblas --- 01-test-environment.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/01-test-environment.md b/01-test-environment.md index d8c1ece..d616271 100644 --- a/01-test-environment.md +++ b/01-test-environment.md @@ -36,6 +36,7 @@ These builds include the latest community contributions and may contain bugs. Th ```bash wget http://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh +chmod +x install_osm.sh ./install_osm.sh -R ReleaseTEN-daily -t releaseten-daily -r testing -y ``` @@ -43,6 +44,7 @@ wget http://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh ```bash wget https://osm-download.etsi.org/ftp/osm-9.0-seven/install_osm.sh +chmod +x install_osm.sh ./install_osm.sh -R ReleaseNINE-daily -t releasenine-daily -r testing -y ``` @@ -50,7 +52,8 @@ wget https://osm-download.etsi.org/ftp/osm-9.0-seven/install_osm.sh ```bash wget http://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh -./install_osm.sh -R testing-daily -t testing-daily -r testing -y -c k8s +chmod +x install_osm.sh +./install_osm.sh -R testing-daily -t testing-daily -r testing -y ``` ## Performing the tests -- GitLab