From c0cd4d7c47c52c1fe6d9621683779d0a2072f7aa Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 24 Nov 2021 12:55:56 +0000 Subject: [PATCH 001/235] Added .gitlab-ci.yml --- .gitlab-ci.yml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3ac699e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,56 @@ +# Copyright ETSI OSM and others +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +daily-robot: + stage: deploy + tags: + - openstack + + artifacts: + paths: + - artifacts + + before_script: + - echo "GitLab Runner Installation" + - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash + - sudo apt-get install gitlab-runner + + - echo "OSM Installation" #Charmed OSM + - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc + - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh + - chmod +x ./install_osm.sh + - sudo snap install microk8s --classic --channel=1.19/stable + - sudo sed -i "s|https://registry-1.docker.io|http://172.21.1.1:5000|" /var/snap/microk8s/current/args/containerd-template.toml + - sudo systemctl restart snap.microk8s.daemon-containerd.service + - sudo snap alias microk8s.kubectl kubectl + - ./install_osm.sh -y -t 10.0.3 2>&1 | tee artifacts/install_osm.log + + - sleep 600 + + script: + - echo "OSM Robot Testing" + - docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing + + after_script: + - echo "Collecting Logs" + - mkdir artifacts + - | + for deployment in `kubectl -n osm get deployments | grep -v operator | grep -v NAME| awk '{print $1}'`; do + echo "Extracting log for $deployment" + kubectl -n osm logs deployments/$deployment --timestamps=true --all-containers 2>&1 > artifacts/$deployment.log + done + for statefulset in `kubectl -n osm get statefulsets | grep -v operator | grep -v NAME| awk '{print $1}'`; do + echo "Extracting log for $statefulset" + kubectl -n osm logs statefulsets/$statefulset --timestamps=true --all-containers 2>&1 > artifacts/$statefulset.log + done -- GitLab From 7d6c0703effd965a362db034c6a3b399127e61ad Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 24 Nov 2021 13:14:18 +0000 Subject: [PATCH 002/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ac699e..990dc58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ daily-robot: script: - echo "OSM Robot Testing" - - docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing + #- docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing after_script: - echo "Collecting Logs" -- GitLab From 86e5a238e79862fbb3611c1dc4ee0da4bedce44d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 25 Nov 2021 09:50:12 +0000 Subject: [PATCH 003/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 990dc58..01b6a49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,11 +30,11 @@ daily-robot: - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh - chmod +x ./install_osm.sh - - sudo snap install microk8s --classic --channel=1.19/stable + - sudo snap install microk8s --classic --channel=1.20/stable - sudo sed -i "s|https://registry-1.docker.io|http://172.21.1.1:5000|" /var/snap/microk8s/current/args/containerd-template.toml - sudo systemctl restart snap.microk8s.daemon-containerd.service - sudo snap alias microk8s.kubectl kubectl - - ./install_osm.sh -y -t 10.0.3 2>&1 | tee artifacts/install_osm.log + - ./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log - sleep 600 -- GitLab From 327b1d64983f4c89b0ebc780a6106df042120533 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 25 Nov 2021 10:27:26 +0000 Subject: [PATCH 004/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01b6a49..162cfe5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,6 +22,7 @@ daily-robot: - artifacts before_script: + - mkdir artifacts - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner @@ -44,7 +45,6 @@ daily-robot: after_script: - echo "Collecting Logs" - - mkdir artifacts - | for deployment in `kubectl -n osm get deployments | grep -v operator | grep -v NAME| awk '{print $1}'`; do echo "Extracting log for $deployment" -- GitLab From 586e335a8dd56ce2c089f62e237b165d43fa9785 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 25 Nov 2021 11:48:56 +0000 Subject: [PATCH 005/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 162cfe5..c3d3a1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,11 +37,12 @@ daily-robot: - sudo snap alias microk8s.kubectl kubectl - ./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log - - sleep 600 + #- sleep 600 script: - echo "OSM Robot Testing" - #- docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing + - env + - docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing after_script: - echo "Collecting Logs" -- GitLab From 7ce8d16ae75b7e04d9b249fada11712cc958599d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 25 Nov 2021 12:22:01 +0000 Subject: [PATCH 006/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3d3a1a..13c9971 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,22 @@ daily-robot: - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner + - echo "Docker installation" + - sudo apt update + - sudo apt full-upgrade -y + - sudo apt install docker.io -y + - sudo usermod -aG docker $USER + - newgrp docker + - | + cat << EOF | sudo tee /etc/docker/daemon.json + { + "registry-mirrors": ["http://172.21.1.1:5000"] + } + EOF + - sudo systemctl daemon-reload + - sudo service docker restart + + - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh -- GitLab From 3d734e8ce12e5d8be2555112d14a9c86634f9c8f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 10:34:07 +0000 Subject: [PATCH 007/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 81 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13c9971..a725977 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,46 +22,79 @@ daily-robot: - artifacts before_script: - - mkdir artifacts - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - echo "Docker installation" - - sudo apt update - - sudo apt full-upgrade -y - - sudo apt install docker.io -y - - sudo usermod -aG docker $USER - - newgrp docker - - | - cat << EOF | sudo tee /etc/docker/daemon.json - { - "registry-mirrors": ["http://172.21.1.1:5000"] - } - EOF - - sudo systemctl daemon-reload - - sudo service docker restart - - - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc - - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh - - chmod +x ./install_osm.sh - - sudo snap install microk8s --classic --channel=1.20/stable + - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh # + - chmod +x ./install_osm.sh # + - sudo snap install microk8s --classic --channel=1.19/stable - sudo sed -i "s|https://registry-1.docker.io|http://172.21.1.1:5000|" /var/snap/microk8s/current/args/containerd-template.toml - sudo systemctl restart snap.microk8s.daemon-containerd.service - sudo snap alias microk8s.kubectl kubectl - - ./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log + - ./install_osm.sh -y -t 10.0.3 2>&1 | tee artifacts/install_osm.log # - #- sleep 600 + # - sleep 600 script: - echo "OSM Robot Testing" - - env - - docker run --env OSM_HOSTNAME=${osmHostname} --env PROMETHEUS_HOSTNAME=${prometheusHostname} ${PROMETHEUS_PORT_VAR} ${JUJU_PASSWORD_VAR} --env-file ${envfile} -v ${clouds}:/etc/openstack/clouds.yaml -v ${osmRSAfile}:/root/osm_id_rsa -v ${kubeconfig}:/root/.kube/config -v ${tempdir}:/robot-systest/reports -v ${portmappingfile}:/root/port-mapping.yaml ${hostfilemount} opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing + #Configuring ENV variables + - export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 + - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") + - export PROMETHEUS_PORT=80 + - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2)' + + + #Creating envfile + - echo "Creating envfile" + - > + cat << EOF >> robot-systest.cfg + VIM_TARGET=osm + VIM_MGMT_NET=osm-ext + ENVIRONMENTS_FOLDER=environments + PACKAGES_FOLDER=/robot-systest/osm-packages + OS_CLOUD=openstack + LC_ALL=C.UTF-8 + LANG=C.UTF-8 + EOF + + - cat robot-systest.cfg + + + #Creating clouds.yaml file + - echo "Creating clouds.yaml file" + - > + 'cat << EOF > clouds.yaml + clouds: + openstack: + auth: + auth_url: $OS_AUTH_URL + project_name: $OS_PROJECT_NAME + username: $OS_USERNAME + password: $OS_PASSWORD + user_domain_name: $OS_USER_DOMAIN_NAME + project_domain_name: $OS_PROJECT_DOMAIN_NAME + EOF' + - cat clouds.yaml + + - ls + #Creating Docker container + - > + docker run --env OSM_HOSTNAME=$OSM_HOSTNAME + --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME + --env PROMETHEUS_PORT=$PROMETHEUS_POR + --env JUJU_PASSWORD=$JUJU_PASSWORD + --env-file robot-systest.cfg + -v "$(pwd)/clouds.yaml":/etc/openstack/clouds.yaml + -v ~/.osm/microk8s-config.yaml:/root/.kube/config + -v "$(pwd)/reports:"/robot-systest/reports + opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing after_script: - echo "Collecting Logs" + - mkdir artifacts - | for deployment in `kubectl -n osm get deployments | grep -v operator | grep -v NAME| awk '{print $1}'`; do echo "Extracting log for $deployment" -- GitLab From 7cd684c69c24a617f158820706dc317d4a631b3f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 10:40:25 +0000 Subject: [PATCH 008/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a725977..7389f75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,8 @@ daily-robot: - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner + - mkdir artifacts + - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh # @@ -94,7 +96,6 @@ daily-robot: after_script: - echo "Collecting Logs" - - mkdir artifacts - | for deployment in `kubectl -n osm get deployments | grep -v operator | grep -v NAME| awk '{print $1}'`; do echo "Extracting log for $deployment" -- GitLab From 127ecc38d5bcc14517f2327c5b470e252d6459bb Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 11:26:14 +0000 Subject: [PATCH 009/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7389f75..278a525 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,23 +22,22 @@ daily-robot: - artifacts before_script: + - mkdir artifacts - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - mkdir artifacts - - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc - - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh # - - chmod +x ./install_osm.sh # - - sudo snap install microk8s --classic --channel=1.19/stable + - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh + - chmod +x ./install_osm.sh + - sudo snap install microk8s --classic --channel=1.20/stable - sudo sed -i "s|https://registry-1.docker.io|http://172.21.1.1:5000|" /var/snap/microk8s/current/args/containerd-template.toml - sudo systemctl restart snap.microk8s.daemon-containerd.service - sudo snap alias microk8s.kubectl kubectl - - ./install_osm.sh -y -t 10.0.3 2>&1 | tee artifacts/install_osm.log # + - ./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log - # - sleep 600 + #- sleep 600 script: - echo "OSM Robot Testing" @@ -47,8 +46,6 @@ daily-robot: - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") - export PROMETHEUS_PORT=80 - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2)' - - #Creating envfile - echo "Creating envfile" - > -- GitLab From dfb84144042009eb8aa1ba04c5ae16f5c77c9480 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 11:52:30 +0000 Subject: [PATCH 010/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 278a525..c563bad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ daily-robot: - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2)' #Creating envfile - echo "Creating envfile" - - > + - | cat << EOF >> robot-systest.cfg VIM_TARGET=osm VIM_MGMT_NET=osm-ext @@ -64,7 +64,7 @@ daily-robot: #Creating clouds.yaml file - echo "Creating clouds.yaml file" - - > + - | 'cat << EOF > clouds.yaml clouds: openstack: -- GitLab From bcdf3a0ceeb05fd2d4acef95b0f6b0985666f0d1 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 12:18:49 +0000 Subject: [PATCH 011/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c563bad..6e84e8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,7 +65,7 @@ daily-robot: #Creating clouds.yaml file - echo "Creating clouds.yaml file" - | - 'cat << EOF > clouds.yaml + cat << EOF > clouds.yaml clouds: openstack: auth: @@ -75,7 +75,7 @@ daily-robot: password: $OS_PASSWORD user_domain_name: $OS_USER_DOMAIN_NAME project_domain_name: $OS_PROJECT_DOMAIN_NAME - EOF' + EOF - cat clouds.yaml - ls -- GitLab From e74d2a78a748720108887d6d8e7299168cca345c Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 12:43:22 +0000 Subject: [PATCH 012/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e84e8e..876a8a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ daily-robot: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner + - sudo apt-get install docker-ce docker-ce-cli containerd.io - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc -- GitLab From 6d05df392cdae56558a19a401adecdbc29d9a2e2 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 12:47:11 +0000 Subject: [PATCH 013/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 876a8a3..469855d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ daily-robot: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - sudo apt-get install docker-ce docker-ce-cli containerd.io + - sudo apt install docker.io - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc -- GitLab From 5b6692eea88fca2cae5a4f09ec581c0acffb6b7f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 12:54:43 +0000 Subject: [PATCH 014/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 469855d..3cd6467 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ daily-robot: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - sudo apt install docker.io + - sudo apt install docker.io -Y - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc -- GitLab From 04078d56c7fb540913100b56c2483bd5f008bb46 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 12:58:34 +0000 Subject: [PATCH 015/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cd6467..2c466f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ daily-robot: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - sudo apt install docker.io -Y + - sudo apt install docker.io -f - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc -- GitLab From 587a9b92b5ba2cbd3d500a41399336f84705642f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 13:06:30 +0000 Subject: [PATCH 016/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c466f8..14872d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ daily-robot: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - sudo apt install docker.io -f + - sudo apt install docker.io -y - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc -- GitLab From b228790e2bd69fbcdd74f500cc16b8c9e93d87fe Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 13:29:26 +0000 Subject: [PATCH 017/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14872d8..18aab9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,20 @@ daily-robot: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner + + #Docker setup - sudo apt install docker.io -y + - sudo usermod -aG docker $USER + - newgrp docker + - | + cat << EOF | sudo tee /etc/docker/daemon.json + { + "registry-mirrors": ["http://172.21.1.1:5000"] + } + EOF + - sudo systemctl daemon-reload + - sudo service docker restart + - echo "OSM Installation" #Charmed OSM - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc -- GitLab From bad0f2ecaaa858ecda8b30ad5272b30622a98c69 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 14:02:19 +0000 Subject: [PATCH 018/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18aab9a..8a5203c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ daily-robot: before_script: - mkdir artifacts + - mkdir reports - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner @@ -37,6 +38,7 @@ daily-robot: "registry-mirrors": ["http://172.21.1.1:5000"] } EOF + - sudo chmod 666 /var/run/docker.sock - sudo systemctl daemon-reload - sudo service docker restart @@ -92,6 +94,7 @@ daily-robot: EOF - cat clouds.yaml + - env - ls #Creating Docker container - > @@ -100,9 +103,9 @@ daily-robot: --env PROMETHEUS_PORT=$PROMETHEUS_POR --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg - -v "$(pwd)/clouds.yaml":/etc/openstack/clouds.yaml + -v /clouds.yam":/etc/openstack/clouds.yaml -v ~/.osm/microk8s-config.yaml:/root/.kube/config - -v "$(pwd)/reports:"/robot-systest/reports + -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing after_script: -- GitLab From a52d53469e19b3850a83b1e9bfc664b89b59a875 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 14:51:28 +0000 Subject: [PATCH 019/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a5203c..a1f0927 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,7 @@ daily-robot: --env PROMETHEUS_PORT=$PROMETHEUS_POR --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg - -v /clouds.yam":/etc/openstack/clouds.yaml + -v /clouds.yam:/etc/openstack/clouds.yaml -v ~/.osm/microk8s-config.yaml:/root/.kube/config -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing -- GitLab From 213e967b6fc5904e934ccad2c15df18ad6a34789 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 29 Nov 2021 15:27:05 +0000 Subject: [PATCH 020/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1f0927..a20183b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,10 +58,10 @@ daily-robot: script: - echo "OSM Robot Testing" #Configuring ENV variables - - export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 - - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") + - export OSM_HOSTNAME="$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443" + - export PROMETHEUS_HOSTNAME="$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///")" - export PROMETHEUS_PORT=80 - - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2)' + - export JUJU_PASSWORD="$(juju gui 2>&1 | grep password | cut -d: -f2)" #Creating envfile - echo "Creating envfile" - | -- GitLab From b39f77713725b5cbd4ed72f405afc847c6c1e52a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 30 Nov 2021 08:53:42 +0000 Subject: [PATCH 021/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a20183b..9cb92d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,10 +58,13 @@ daily-robot: script: - echo "OSM Robot Testing" #Configuring ENV variables - - export OSM_HOSTNAME="$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443" - - export PROMETHEUS_HOSTNAME="$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///")" + - juju status + - juju config -m osm nbi site_url | sed "s/http.*\?:\/\///" + #- export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 + - juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///" + #- export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") - export PROMETHEUS_PORT=80 - - export JUJU_PASSWORD="$(juju gui 2>&1 | grep password | cut -d: -f2)" + - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2)' #Creating envfile - echo "Creating envfile" - | -- GitLab From 30c1dba1f595ea44e5c30bc9e85889661a675e9e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 30 Nov 2021 09:21:21 +0000 Subject: [PATCH 022/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cb92d4..e5d9ada 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,6 +18,7 @@ daily-robot: - openstack artifacts: + when: always paths: - artifacts -- GitLab From 45e12f849865df9c57014d4a422e8be3567cd205 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 30 Nov 2021 14:55:42 +0000 Subject: [PATCH 023/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5d9ada..f1dcd4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,15 @@ # See the License for the specific language governing permissions and # limitations under the License. +variables: + TESTS_VERSION: $TESTS_VERSION #2.7.1 + OS_USER: $OS_USER + OS_PASSWORD: $OS_PASSWORD + OS_AUTH_URL: $OS_AUTH_URL + OS_PROJECT_NAME: $OS_PROJECT_NAME + OS_USER_DOMAIN_NAME: $OS_USER_DOMAIN_NAME + OS_PROJECT_DOMAIN_NAME: $OS_PROJECT_DOMAIN_NAME + daily-robot: stage: deploy tags: @@ -110,7 +119,7 @@ daily-robot: -v /clouds.yam:/etc/openstack/clouds.yaml -v ~/.osm/microk8s-config.yaml:/root/.kube/config -v /reports:/robot-systest/reports - opensourcemano/tests:testing-daily -c -T 2.7.1 -t nothing + opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing after_script: - echo "Collecting Logs" -- GitLab From 0a0269a0500874a1b6e6f97559497a9bb3e24d14 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 08:48:53 +0000 Subject: [PATCH 024/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1dcd4a..b9df3d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ daily-robot: - echo "OSM Installation" #Charmed OSM - - sed -i '1 i\\export PATH=/snap/bin:\${PATH}' ~/.bashrc + - export PATH=/snap/bin:\${PATH} - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh - chmod +x ./install_osm.sh - sudo snap install microk8s --classic --channel=1.20/stable -- GitLab From 81d6addcbe5417c28b42b99c259aace4a07fadd0 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 09:06:13 +0000 Subject: [PATCH 025/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9df3d6..33f2482 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ daily-robot: - echo "OSM Installation" #Charmed OSM - - export PATH=/snap/bin:\${PATH} + - export PATH=/snap/bin - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh - chmod +x ./install_osm.sh - sudo snap install microk8s --classic --channel=1.20/stable -- GitLab From 214c4bf254a028fb7423e82e77825ac839bdfc2b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 09:11:54 +0000 Subject: [PATCH 026/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33f2482..1799efb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ daily-robot: - echo "OSM Installation" #Charmed OSM - - export PATH=/snap/bin + # - export PATH=/snap/bin - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh - chmod +x ./install_osm.sh - sudo snap install microk8s --classic --channel=1.20/stable -- GitLab From b9859d9c703754fb9ac19975c81da7f524d84775 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 09:29:00 +0000 Subject: [PATCH 027/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1799efb..047f927 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ daily-robot: - echo "OSM Installation" #Charmed OSM - # - export PATH=/snap/bin + - export PATH=/snap/bin:$PATH - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh - chmod +x ./install_osm.sh - sudo snap install microk8s --classic --channel=1.20/stable -- GitLab From 928a877f5b980e6a6b0e649f6df547a66a222699 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 09:56:43 +0000 Subject: [PATCH 028/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 047f927..b5a00df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,11 +68,8 @@ daily-robot: script: - echo "OSM Robot Testing" #Configuring ENV variables - - juju status - - juju config -m osm nbi site_url | sed "s/http.*\?:\/\///" - #- export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 - - juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///" - #- export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") + - export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 + - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") - export PROMETHEUS_PORT=80 - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2)' #Creating envfile @@ -90,7 +87,6 @@ daily-robot: - cat robot-systest.cfg - #Creating clouds.yaml file - echo "Creating clouds.yaml file" - | @@ -107,8 +103,6 @@ daily-robot: EOF - cat clouds.yaml - - env - - ls #Creating Docker container - > docker run --env OSM_HOSTNAME=$OSM_HOSTNAME -- GitLab From 68349986accd87a7c0c8cb408b6cc08b4e3e0471 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 11:13:53 +0000 Subject: [PATCH 029/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5a00df..660ef34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,6 +51,8 @@ daily-robot: - sudo chmod 666 /var/run/docker.sock - sudo systemctl daemon-reload - sudo service docker restart + + - docker pull opensourcemano/tests:latest - echo "OSM Installation" #Charmed OSM -- GitLab From 8bdddd416e3eba8f1f85109411cad4597706ce27 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 11:23:19 +0000 Subject: [PATCH 030/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 660ef34..ae8d590 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ # limitations under the License. variables: - TESTS_VERSION: $TESTS_VERSION #2.7.1 + TESTS_VERSION: "2.7.1" OS_USER: $OS_USER OS_PASSWORD: $OS_PASSWORD OS_AUTH_URL: $OS_AUTH_URL @@ -112,7 +112,7 @@ daily-robot: --env PROMETHEUS_PORT=$PROMETHEUS_POR --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg - -v /clouds.yam:/etc/openstack/clouds.yaml + -v /clouds.yaml:/etc/openstack/clouds.yaml -v ~/.osm/microk8s-config.yaml:/root/.kube/config -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing -- GitLab From 00cbd47d8e18de3d21fac3865a2bebdbabc21595 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 11:47:55 +0000 Subject: [PATCH 031/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae8d590..6e5e008 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,7 +109,7 @@ daily-robot: - > docker run --env OSM_HOSTNAME=$OSM_HOSTNAME --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME - --env PROMETHEUS_PORT=$PROMETHEUS_POR + --env PROMETHEUS_PORT=$PROMETHEUS_PORT --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml -- GitLab From 34e79069fc2b6f86966b704adde2120566babc5f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 12:37:38 +0000 Subject: [PATCH 032/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e5e008..b33f010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,7 +98,7 @@ daily-robot: auth: auth_url: $OS_AUTH_URL project_name: $OS_PROJECT_NAME - username: $OS_USERNAME + username: $OS_USER password: $OS_PASSWORD user_domain_name: $OS_USER_DOMAIN_NAME project_domain_name: $OS_PROJECT_DOMAIN_NAME -- GitLab From a6de4406791911025063d558363181ad0b122b22 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 12:58:54 +0000 Subject: [PATCH 033/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b33f010..8cdbe00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ daily-robot: - sudo systemctl daemon-reload - sudo service docker restart - - docker pull opensourcemano/tests:latest + - docker pull opensourcemano/tests:testing-daily - echo "OSM Installation" #Charmed OSM -- GitLab From 1c91d8a2f78df3a721b871d713fcbc28d12a13ea Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 3 Dec 2021 13:39:10 +0000 Subject: [PATCH 034/235] Configuration File Templates Adding K8s config file to use for running OSM Robot suite; not needed for TST010 Adding openstack-etsi.rc as a template where the password needs to be replaced by the ETSI_VIM_PASSWORD secret from the environment --- hive/kubeconfig.yaml | 19 +++++++++++++++++++ hive/openstack-etsi.rc | 10 ++++++++++ 2 files changed, 29 insertions(+) create mode 100644 hive/kubeconfig.yaml create mode 100644 hive/openstack-etsi.rc diff --git a/hive/kubeconfig.yaml b/hive/kubeconfig.yaml new file mode 100644 index 0000000..e28b440 --- /dev/null +++ b/hive/kubeconfig.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +clusters: +- cluster: + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01URXhNekF3TXpFMU5Gb1hEVE13TVRFeE1UQXdNekUxTkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSjFZClNvcjZOSGdNOVhFY0ZtcEtNOWI2NWVDbUVPNzJIV3JZT2RyU29mcGEybDNQNko2Z0lBa1p2YmkvTUxlZnVoUXQKTlM5dmtab1duZ1dxN3c5LzI2TFk5Zkl5UWdLdGo0OE4vRm1mSUhiaXNUUDh3M1hsL1pMRlJkaEFFSzNXTkcvUwo5R3BTWlREd0dlNHB6a3hOY0l6Q2dPT3YvQkNVOTlta3FtY1VRTFJDK0RnWGZmamppVVFGRWdTVVdWWndRdW9CCjVYRHRjR3J5eS9LczZZQnk2WFVZejBDc2RNME80cUw2aEJtQ3RwaysrQ01Oa29uZlJtdlU4Nko1NGxwajRQVjEKTXVsMXEwS2hCeHFoZzBXUFBTV2hWQkNqaGxybjJkb21YaGhHNmp0NFk0L2N3Wmk2blB0b3RhSDlOZzBxdCtCMgo1WjdvTjlqTm1hdnRudFJrK1JNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJbE0xLzBjQkV0ZmlkQWN0eWtaVE1pRFpTWHIKN2F4Ly9PRnk1U3l0YVkyVXQ4cWpaYUswYXZEaGpZczlsTXBRWDVOb3dmdjZtT3R2U3diN05OQlI5bDZzOFEvKwpjRlZLYmNwUG1zRG4xVFVKZTVaR0JvT3Yra3F5a1hOYm5odVVWV3RqZjE1SFVwczRNR2o5aGZhNmNvNVduQ2E2CmR3R2VEMXpYUTM0ZmhySitxbTJ1WGwybE9kVTVNVS8yZGdqd1UxeVQ0T3ZOR2p1dG12dytYbzNyR3BYVUFBM08KZHVBbVk0ZFNkcjFWenlBODcxbkJkT3FEclJPR2ZTVE5WZ0ljdEhkOHFLWmE0WVZlL2FVc2gzTS9Xa0dIZlFPSgpIY1B2Nk0rd3p4dzF0L0lsbDd5RFpScHNNTGFDZXJyOVNyQ1FpNmtIaGhiSXh4YlNNbVhWd1FPUDhDdz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + server: https://172.21.248.18:6443 + name: kubernetes +contexts: +- context: + cluster: kubernetes + user: kubernetes-admin + name: kubernetes-admin@kubernetes +current-context: kubernetes-admin@kubernetes +kind: Config +preferences: {} +users: +- name: kubernetes-admin + user: + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJRHhmTkpFajlJcmN3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURFeE1UTXdNRE14TlRSYUZ3MHlNakV4TVRZeE5UVXlOVFJhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQStTTjBhVm56d1dJZFc0eVEKUDRndTYvejJDQmIzWWNIU2h4aUpzakxwMjJaMHJ2MURoQXZBdGt1My9YbXA0eEhWeHFwTzdnM0V0R3BLNU41bQo2VkZlN0NvV0gyOXBDYXFMa0JTbmpvVXJ6YjJUSFFUZG9obFpzNlBYZXF0LzJ3cStQRWNROFkwc3diR2VSU1I4CkJUT2ZmUlNhT1FSWDRWY3d4cU93OWt0SmdvbnlkcWswSWNacmlEdGF1VHdIVjlaelU4MTVSc25EeU8rMHhUWlMKQ2lPdEg0THh0ZVhlQWdLNlRUK2NsS3FGMXR0bE5zK2RTWFlEYWhLdWxRS0tSSGhKYjVRRWNZV0I1Q1dGUk5CMQozR0JEcEJiUkZTd0hrWVFEUm50eGRXTEhsTFNpUVdXUVU1L28wcHFDVmVLdGQrSkhwRzJVeTQra1NybWx5eTVzCjdOYThOd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFIeEtxa1pYOUR3QWhubFVsNEhpK1hEdlJVU3g3cjZ2MXpjVgpjckZkMUFMNWx4Rm9TTnhpOGlLTmkzOHU1WE5PcGhZWmE2RTRrU2xpVzlreWhUajQyaUthQzFoMGxMMlQ3N0lCCldoMktOenNpdjRZSjBuVlFXNmpMM1hPM2w2Ukpab2ZLc2JzNkJtSkJHejNIcENQZmNxdTI0R0lrUHF1b2pyaU4KamU3cHB1ZHNzVEY2cTRTTkw0aFFFZ0xFVFczU3dHTmtRN04wcWJvTHhhQmRGWC96dmRsN01aaXJrLzFVb0hNRQozV2pzSERHc3BCQnBwNlBHRlcraXpRNEJpckZLOVJmTno1a0svV3ZSRm12TG8rRFc3TCtTMjF6MkZROERwRTdHCjJnT1d3dmRROFVBUWpTZHEyVHdWZEJ0MEdJWEVmZlFLaDc5enpMY1FIbTBwOEpTZjYvVT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBK1NOMGFWbnp3V0lkVzR5UVA0Z3U2L3oyQ0JiM1ljSFNoeGlKc2pMcDIyWjBydjFECmhBdkF0a3UzL1htcDR4SFZ4cXBPN2czRXRHcEs1TjVtNlZGZTdDb1dIMjlwQ2FxTGtCU25qb1VyemIyVEhRVGQKb2hsWnM2UFhlcXQvMndxK1BFY1E4WTBzd2JHZVJTUjhCVE9mZlJTYU9RUlg0VmN3eHFPdzlrdEpnb255ZHFrMApJY1pyaUR0YXVUd0hWOVp6VTgxNVJzbkR5TysweFRaU0NpT3RINEx4dGVYZUFnSzZUVCtjbEtxRjF0dGxOcytkClNYWURhaEt1bFFLS1JIaEpiNVFFY1lXQjVDV0ZSTkIxM0dCRHBCYlJGU3dIa1lRRFJudHhkV0xIbExTaVFXV1EKVTUvbzBwcUNWZUt0ZCtKSHBHMlV5NCtrU3JtbHl5NXM3TmE4TndJREFRQUJBb0lCQURjcnk4Njh0Y2NnWkNIdQo2YzYzNkxRbnk1QVZEZWxmRTdFSkZRMGFTMEZqMmZrYWFzWW1HQ0lHZUpNd1N4Zld6a0YxVzQ5S0MwSnN1M01kCmNTcS84MFpYTjVqMGdnMDY4RGNTNjl3YXo0MTdLc1hsV3ZOWHE4NmxQTVdVanZiQjFVamg3L1dkN3NoaC9ndVAKdmNzbEdHK0pqWEdNN2EwZ010UDZVZWpvMlRtSHhRZXJZQzFMbVlmbmlJSC9ZZHNuazBEYlpLRVZwK3hHc0tvawpOcDE5RWYyS1cycDA2STFuUU1QSFRzVG9rbW0rQkUySXcrTk9tWlEvZ01DSVFyUHd0UTIvWnFEUlVkdFJRa21kClFuR3FvbUQzdnBHbHJEdDR2aS9iRHliaFlMTEkvZC8zQzhCcUE0eEI1R3Vuc01VU0pQcHVZQTd5d2RnZGorNmkKYzdtZUZQRUNnWUVBK3EyTGNIdi96R0tqZ0dHVDNBOVRQNVpmTG1pdXV2RWlORWZHaTNSMFhtczgvblVhUExETgpBTk96bmczYWhZRk5Fc0E2Z0lONmZJQ3NUZzgyZm5mbUlsVnAxZzhweFBBVkJpd2JrSnVBVVN4MUpVZDM2NjVvCm05RmNVVDgwMnNkVFo4cVR5WW1lOHZmY3l1VXQ0eUlOUjVNTHEvMFhwYjVmbFozMEQvT0ZEUWtDZ1lFQS9tMkwKRDNlaW4zQVZRdTgzV2E3VXNGR3lKSG5XcFlqYkZkUG9LeXRweUVPTk5zZWtnWUlKL2xzZUlHejIvd3ArTG1xUgpvVWRwV2dXeEpuaU10M1k0RVpMOGdacFVOanI0L1h3WVFjcHhXUG9FL1NZN01YbWtTcVJSOWxyQkMzQmZlRzZWClVGVXFMeWp5UEErWmZxcXBSWHg3ZnRkWU5qenFJLy8xWjVMdER6OENnWUJ6cnNyK3FmcXVNNGNJby84OE9zWk0KUGZURzBnQnd2UDd2NlgreXM1ZFFTMlRtZU53V3pmQ05SU1ZLOTFHMDhxckMwSHN1KzMzM0h0cGxXNWZtWFNhVApDWi9CN1ZWMVVPWWk1eEFCZUFHTGRGekxTMlFJRzRDakI4YjJwNWlZcmd2TGhpMFZnTEVkcDB6NVJUSWI4NGIxClZPSzZDQjUxbXBrNXpwN25EWmFGSVFLQmdGRE0zeVhaVzVjQTFHKytZcmlqa2o0d283OTd4aFFxQTFIS1MyZ3kKVUZUZVJ5R0hnNUh4aDFUMUFQdFJQNXU5YkZjM1Z1cCtNRkg3anNmbDd1SndzOXU0NzJJRmJnc083WFlyQzlVUgpBckE4TG90cXNjL0RqczU1b3VIMjdtbkFsVUU4OVVSZTE1ZkVqREZRenZGd0ozTysxY1Z4aEQwdFdUcDNsaXIvCmVUT25Bb0dCQUxFVzJnRCtDenhXVkxPOGpodWpsNXYvS1BadTZnODVLMk1BdWVaTlM3YTJLdWpTeURINkQ4VlEKcEhqTjFDL2FjTDEvanAyYVhQQzFxSy9Nbm8wZUZqK0ZHZGxudWtSZHhSZEtVSGMzVFBidlZXaTZ2VjlvMC9QTQpEV2RPVStWWWhlS2lXWkpGWWFNcHIvQUxMa0pKV1lmUHRXYndDSitrZytEbXUzamxKRU05Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== diff --git a/hive/openstack-etsi.rc b/hive/openstack-etsi.rc new file mode 100644 index 0000000..5651b6b --- /dev/null +++ b/hive/openstack-etsi.rc @@ -0,0 +1,10 @@ +OS_AUTH_URL=http://172.21.247.1:5000/v3 +OS_PROJECT_ID=34a71bb7d82f4ec691d8cc11045ae83e +OS_PROJECT_NAME=osm_jenkins +OS_USER_DOMAIN_NAME=Default +OS_PROJECT_DOMAIN_ID=default +OS_USERNAME=osm_jenkins +OS_PASSWORD=REPLACE_WITH_ETSI_VIM_PASSWORD +OS_REGION_NAME=RegionOne +OS_INTERFACE=public +OS_IDENTITY_API_VERSION=3 -- GitLab From 92144926ae79ccb5606f9fb72caf79e715b8083e Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 3 Dec 2021 14:38:03 +0000 Subject: [PATCH 035/235] quick test to check syntax of docker run command --- .gitlab-ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8cdbe00..e66c6c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,6 +106,17 @@ daily-robot: - cat clouds.yaml #Creating Docker container + - > + echo docker run --env OSM_HOSTNAME=$OSM_HOSTNAME + --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME + --env PROMETHEUS_PORT=$PROMETHEUS_PORT + --env JUJU_PASSWORD=$JUJU_PASSWORD + --env-file robot-systest.cfg + -v /clouds.yaml:/etc/openstack/clouds.yaml + -v ~/.osm/microk8s-config.yaml:/root/.kube/config + -v /reports:/robot-systest/reports + opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing + - > docker run --env OSM_HOSTNAME=$OSM_HOSTNAME --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME -- GitLab From c27c1d7a31ffc88acfe5a852c0ce37fd4e3973e0 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 15:09:29 +0000 Subject: [PATCH 036/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e66c6c3..ea09d35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ daily-robot: - export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") - export PROMETHEUS_PORT=80 - - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2)' + - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs)' #Creating envfile - echo "Creating envfile" - | @@ -106,17 +106,6 @@ daily-robot: - cat clouds.yaml #Creating Docker container - - > - echo docker run --env OSM_HOSTNAME=$OSM_HOSTNAME - --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME - --env PROMETHEUS_PORT=$PROMETHEUS_PORT - --env JUJU_PASSWORD=$JUJU_PASSWORD - --env-file robot-systest.cfg - -v /clouds.yaml:/etc/openstack/clouds.yaml - -v ~/.osm/microk8s-config.yaml:/root/.kube/config - -v /reports:/robot-systest/reports - opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing - - > docker run --env OSM_HOSTNAME=$OSM_HOSTNAME --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME -- GitLab From 34f7fd413daf21fdc22d1954103628969ef046f1 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 3 Dec 2021 16:16:08 +0000 Subject: [PATCH 037/235] Update .gitlab-ci.yml, hive/openstack-etsi.rc files --- .gitlab-ci.yml | 15 ++++++--------- hive/openstack-etsi.rc | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea09d35..8c742a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,12 +14,8 @@ variables: TESTS_VERSION: "2.7.1" - OS_USER: $OS_USER - OS_PASSWORD: $OS_PASSWORD - OS_AUTH_URL: $OS_AUTH_URL - OS_PROJECT_NAME: $OS_PROJECT_NAME - OS_USER_DOMAIN_NAME: $OS_USER_DOMAIN_NAME - OS_PROJECT_DOMAIN_NAME: $OS_PROJECT_DOMAIN_NAME + ETSI_VIM_PASSWORD: $ETSI_VIM_PASSWORD + HIVE_PATH: "/builds/gitlab/devops/cicd/hive" daily-robot: stage: deploy @@ -52,8 +48,6 @@ daily-robot: - sudo systemctl daemon-reload - sudo service docker restart - - docker pull opensourcemano/tests:testing-daily - - echo "OSM Installation" #Charmed OSM - export PATH=/snap/bin:$PATH @@ -65,15 +59,16 @@ daily-robot: - sudo snap alias microk8s.kubectl kubectl - ./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log - #- sleep 600 script: - echo "OSM Robot Testing" + #Configuring ENV variables - export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") - export PROMETHEUS_PORT=80 - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs)' + #Creating envfile - echo "Creating envfile" - | @@ -92,6 +87,7 @@ daily-robot: #Creating clouds.yaml file - echo "Creating clouds.yaml file" - | + source $HIVE_PATH/openstack-etsi.rc cat << EOF > clouds.yaml clouds: openstack: @@ -113,6 +109,7 @@ daily-robot: --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml + -v $HIVE_PATH/kubeconfig.yaml:/root/.kube/config -v ~/.osm/microk8s-config.yaml:/root/.kube/config -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing diff --git a/hive/openstack-etsi.rc b/hive/openstack-etsi.rc index 5651b6b..1481ba2 100644 --- a/hive/openstack-etsi.rc +++ b/hive/openstack-etsi.rc @@ -4,7 +4,7 @@ OS_PROJECT_NAME=osm_jenkins OS_USER_DOMAIN_NAME=Default OS_PROJECT_DOMAIN_ID=default OS_USERNAME=osm_jenkins -OS_PASSWORD=REPLACE_WITH_ETSI_VIM_PASSWORD +OS_PASSWORD=$ETSI_VIM_PASSWORD OS_REGION_NAME=RegionOne OS_INTERFACE=public OS_IDENTITY_API_VERSION=3 -- GitLab From 84c642806b7f6cf18d2ab19efcea3a16826e43cf Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 09:44:23 +0000 Subject: [PATCH 038/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c742a0..0d494f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,9 @@ daily-robot: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - + + - test -f $HIVE_PATH/openstack-etsi.rc && echo "Test 1" + - test -f ~/$HIVE_PATH/openstack-etsi.rc && echo "Test 2" #Docker setup - sudo apt install docker.io -y - sudo usermod -aG docker $USER -- GitLab From 826c025a62a860887b0a599a52bb41a8bb152531 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 09:48:56 +0000 Subject: [PATCH 039/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d494f0..0cf8f1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ daily-robot: - sudo apt-get install gitlab-runner - test -f $HIVE_PATH/openstack-etsi.rc && echo "Test 1" - - test -f ~/$HIVE_PATH/openstack-etsi.rc && echo "Test 2" + - test -f ~/$HIVE_PATH/openstack-etsi.rc && echo "Test 2" #Docker setup - sudo apt install docker.io -y - sudo usermod -aG docker $USER -- GitLab From a2195e64f3d2e5cfc6fbb4e141eef5c8e4740239 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 09:51:43 +0000 Subject: [PATCH 040/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cf8f1a..391123f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: TESTS_VERSION: "2.7.1" ETSI_VIM_PASSWORD: $ETSI_VIM_PASSWORD - HIVE_PATH: "/builds/gitlab/devops/cicd/hive" + HIVE_PATH: "~/builds/gitlab/devops/cicd/hive" daily-robot: stage: deploy @@ -34,8 +34,7 @@ daily-robot: - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - test -f $HIVE_PATH/openstack-etsi.rc && echo "Test 1" - - test -f ~/$HIVE_PATH/openstack-etsi.rc && echo "Test 2" + #Docker setup - sudo apt install docker.io -y - sudo usermod -aG docker $USER -- GitLab From c5dfcbdbcf857af9fd248155ed4a148b48931dc9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 10:19:01 +0000 Subject: [PATCH 041/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 391123f..09fe092 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,8 @@ daily-robot: - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner + - ls -a + #Docker setup - sudo apt install docker.io -y -- GitLab From ba9b4e6d23084597a56f8228ada128dcc8a46587 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 10:24:45 +0000 Subject: [PATCH 042/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09fe092..f6fa6ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: TESTS_VERSION: "2.7.1" ETSI_VIM_PASSWORD: $ETSI_VIM_PASSWORD - HIVE_PATH: "~/builds/gitlab/devops/cicd/hive" + #HIVE_PATH: "~/builds/gitlab/devops/cicd/hive" daily-robot: stage: deploy @@ -90,7 +90,7 @@ daily-robot: #Creating clouds.yaml file - echo "Creating clouds.yaml file" - | - source $HIVE_PATH/openstack-etsi.rc + source hive/openstack-etsi.rc cat << EOF > clouds.yaml clouds: openstack: -- GitLab From 2042ec0753f8246b1055759cd1a64bae2b9b8cd2 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 10:46:15 +0000 Subject: [PATCH 043/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6fa6ad..98512da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,7 @@ daily-robot: --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml - -v $HIVE_PATH/kubeconfig.yaml:/root/.kube/config + -v hive/kubeconfig.yaml:/root/.kube/config -v ~/.osm/microk8s-config.yaml:/root/.kube/config -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing -- GitLab From abd1e630488ec0cbdf74a9d433edf34e7d265cef Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 10:50:45 +0000 Subject: [PATCH 044/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98512da..a3055c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,10 +97,10 @@ daily-robot: auth: auth_url: $OS_AUTH_URL project_name: $OS_PROJECT_NAME - username: $OS_USER + username: $OS_USERNAME password: $OS_PASSWORD user_domain_name: $OS_USER_DOMAIN_NAME - project_domain_name: $OS_PROJECT_DOMAIN_NAME + project_domain_name: $OS_PROJECT_DOMAIN_ID EOF - cat clouds.yaml -- GitLab From 785d5f8556171672ba32f1e5c9fe0d1e609c6211 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 10:52:43 +0000 Subject: [PATCH 045/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3055c9..7ddcb61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,7 +113,6 @@ daily-robot: --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml -v hive/kubeconfig.yaml:/root/.kube/config - -v ~/.osm/microk8s-config.yaml:/root/.kube/config -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing -- GitLab From 30be0448ea94c285c8d9042336088c7574468339 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 11:28:46 +0000 Subject: [PATCH 046/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ddcb61..971ead4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,7 @@ daily-robot: --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml - -v hive/kubeconfig.yaml:/root/.kube/config + -v /hive/kubeconfig.yaml:/root/.kube/config -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing -- GitLab From b0deca5b99523d9cebe5c004f553b7d497195382 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 11:29:36 +0000 Subject: [PATCH 047/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 971ead4..fe7dd7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,7 @@ daily-robot: --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml - -v /hive/kubeconfig.yaml:/root/.kube/config + -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config -v /reports:/robot-systest/reports opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing -- GitLab From 32a413804a638f778dccdaf2cd076167035bfb8d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 16:02:13 +0000 Subject: [PATCH 048/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe7dd7c..033b4b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,6 +67,7 @@ daily-robot: - echo "OSM Robot Testing" #Configuring ENV variables + - source hive/openstack-etsi.rc - export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") - export PROMETHEUS_PORT=80 @@ -85,6 +86,7 @@ daily-robot: LANG=C.UTF-8 EOF + - cat /$(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg - cat robot-systest.cfg #Creating clouds.yaml file @@ -110,7 +112,7 @@ daily-robot: --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME --env PROMETHEUS_PORT=$PROMETHEUS_PORT --env JUJU_PASSWORD=$JUJU_PASSWORD - --env-file robot-systest.cfg + --env-file {cat robot-systest.cfg | envsubst} -v /clouds.yaml:/etc/openstack/clouds.yaml -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config -v /reports:/robot-systest/reports -- GitLab From b7561bab122f3c16470ca4e3c39046ef63953b2a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 16:05:23 +0000 Subject: [PATCH 049/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 033b4b2..3291657 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,7 @@ daily-robot: --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME --env PROMETHEUS_PORT=$PROMETHEUS_PORT --env JUJU_PASSWORD=$JUJU_PASSWORD - --env-file {cat robot-systest.cfg | envsubst} + --env-file $(cat robot-systest.cfg | envsubst) -v /clouds.yaml:/etc/openstack/clouds.yaml -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config -v /reports:/robot-systest/reports -- GitLab From 2f94388b4a1c5930810236394bba8ae06fb1424f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 6 Dec 2021 16:16:34 +0000 Subject: [PATCH 050/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3291657..8711d3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,13 +86,13 @@ daily-robot: LANG=C.UTF-8 EOF - - cat /$(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg + - envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg - cat robot-systest.cfg #Creating clouds.yaml file - echo "Creating clouds.yaml file" - | - source hive/openstack-etsi.rc + source /$(pwd)/hive/openstack-etsi.rc cat << EOF > clouds.yaml clouds: openstack: @@ -112,7 +112,7 @@ daily-robot: --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME --env PROMETHEUS_PORT=$PROMETHEUS_PORT --env JUJU_PASSWORD=$JUJU_PASSWORD - --env-file $(cat robot-systest.cfg | envsubst) + --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config -v /reports:/robot-systest/reports -- GitLab From 97cf1f29b63847ec46f17d468d92fca37be74042 Mon Sep 17 00:00:00 2001 From: beierlm Date: Mon, 6 Dec 2021 17:56:08 +0000 Subject: [PATCH 051/235] Updating fetching of container logs --- .gitlab-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8711d3c..e85a36c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,12 +120,10 @@ daily-robot: after_script: - echo "Collecting Logs" + - kubectl get pods -n osm - | - for deployment in `kubectl -n osm get deployments | grep -v operator | grep -v NAME| awk '{print $1}'`; do - echo "Extracting log for $deployment" - kubectl -n osm logs deployments/$deployment --timestamps=true --all-containers 2>&1 > artifacts/$deployment.log - done - for statefulset in `kubectl -n osm get statefulsets | grep -v operator | grep -v NAME| awk '{print $1}'`; do - echo "Extracting log for $statefulset" - kubectl -n osm logs statefulsets/$statefulset --timestamps=true --all-containers 2>&1 > artifacts/$statefulset.log + for container in `kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do + logfile=`echo $container | cut -d- -f1` + echo "Extracting log for $logfile" + kubectl logs -n osm $container --timestamps=true 2>&1 > artifacts/$logfile.log done -- GitLab From 35b17fd5ab548ef80e3b65d4cd2d414a6fc65cd0 Mon Sep 17 00:00:00 2001 From: beierlm Date: Mon, 6 Dec 2021 18:21:43 +0000 Subject: [PATCH 052/235] Adding microk8s to kubectl command --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e85a36c..5e7ce0d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,10 +120,10 @@ daily-robot: after_script: - echo "Collecting Logs" - - kubectl get pods -n osm + - microk8s.kubectl get pods -n osm - | - for container in `kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do + for container in `microk8s.kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do logfile=`echo $container | cut -d- -f1` echo "Extracting log for $logfile" - kubectl logs -n osm $container --timestamps=true 2>&1 > artifacts/$logfile.log + microk8s.kubectl logs -n osm $container --timestamps=true 2>&1 > artifacts/$logfile.log done -- GitLab From 17be4ca2256e2bb237f8e7eaaa7ae03db358458c Mon Sep 17 00:00:00 2001 From: beierlm Date: Mon, 6 Dec 2021 18:44:05 +0000 Subject: [PATCH 053/235] Need to add path to after script --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e7ce0d..b6a57f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,6 +119,7 @@ daily-robot: opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing after_script: + - export PATH=/snap/bin:$PATH - echo "Collecting Logs" - microk8s.kubectl get pods -n osm - | -- GitLab From 43d7ad3ac5cb04b5a30b8578d39359db1433e5da Mon Sep 17 00:00:00 2001 From: beierlm Date: Mon, 6 Dec 2021 19:58:07 +0000 Subject: [PATCH 054/235] Fixing logs and reports --- .gitlab-ci.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6a57f1..0844d16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,11 +111,11 @@ daily-robot: docker run --env OSM_HOSTNAME=$OSM_HOSTNAME --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME --env PROMETHEUS_PORT=$PROMETHEUS_PORT - --env JUJU_PASSWORD=$JUJU_PASSWORD + --env JUJU_PASSWORD=$JUJU_PASSWORD --env-file robot-systest.cfg -v /clouds.yaml:/etc/openstack/clouds.yaml -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config - -v /reports:/robot-systest/reports + -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing after_script: @@ -123,8 +123,11 @@ daily-robot: - echo "Collecting Logs" - microk8s.kubectl get pods -n osm - | - for container in `microk8s.kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do - logfile=`echo $container | cut -d- -f1` + for pod in `microk8s.kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do + logfile=`echo $pod | cut -d- -f1` echo "Extracting log for $logfile" - microk8s.kubectl logs -n osm $container --timestamps=true 2>&1 > artifacts/$logfile.log + container="" + if [ $pod == "prometheus-0" ] ; then container="prometheus" ; fi + if [ $pod == "mongodb-k8s-0" ] ; then container="mongodb-k8s" ; fi + microk8s.kubectl logs -n osm $pod $container --timestamps=true 2>&1 > artifacts/$logfile.log done -- GitLab From 31378b00cac1dde5e6c634e6db749e69b2a73ccb Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 7 Dec 2021 13:48:47 +0000 Subject: [PATCH 055/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0844d16..300e661 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,10 +17,18 @@ variables: ETSI_VIM_PASSWORD: $ETSI_VIM_PASSWORD #HIVE_PATH: "~/builds/gitlab/devops/cicd/hive" +stages: + - build + - test + - deploy + + daily-robot: stage: deploy tags: - openstack + environment: + name: staging artifacts: when: always -- GitLab From 970f99872234693abfddf05c323f79d951f33e47 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 7 Dec 2021 14:28:25 +0000 Subject: [PATCH 056/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 300e661..34289e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,9 @@ stages: - deploy -daily-robot: - stage: deploy +build: + stage: build + when: manual tags: - openstack environment: @@ -139,3 +140,18 @@ daily-robot: if [ $pod == "mongodb-k8s-0" ] ; then container="mongodb-k8s" ; fi microk8s.kubectl logs -n osm $pod $container --timestamps=true 2>&1 > artifacts/$logfile.log done + + daily-testing: + stage: test + tags: + - openstack + environment: + name: staging + + artifacts: + when: always + paths: + - artifacts + + script: + - echo "Running the test..." -- GitLab From 2da77633d9bfb9df713e48d6e23c62d3de85b95f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 7 Dec 2021 14:29:30 +0000 Subject: [PATCH 057/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34289e2..6a38314 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,17 +141,17 @@ build: microk8s.kubectl logs -n osm $pod $container --timestamps=true 2>&1 > artifacts/$logfile.log done - daily-testing: - stage: test - tags: - - openstack - environment: - name: staging +daily-testing: + stage: test + tags: + - openstack + environment: + name: staging - artifacts: - when: always - paths: - - artifacts + artifacts: + when: always + paths: + - artifacts - script: - - echo "Running the test..." + script: + - echo "Running the test..." -- GitLab From 18030d750290745e30a7d1a4e9dafb25068cab34 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 7 Dec 2021 14:30:05 +0000 Subject: [PATCH 058/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a38314..b3e711e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,5 +153,5 @@ daily-testing: paths: - artifacts - script: - - echo "Running the test..." + script: + - echo "Running the test..." -- GitLab From 84cdb4e4347635300fa1b486cf67683bca5ba1e2 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 7 Dec 2021 14:30:38 +0000 Subject: [PATCH 059/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3e711e..2a55f1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,7 @@ daily-testing: tags: - openstack environment: - name: staging + name: staging artifacts: when: always -- GitLab From 405d98a029d70eba19866a6d55e2a5d56abc9079 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 7 Dec 2021 14:31:51 +0000 Subject: [PATCH 060/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2a55f1c..cdf6dad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,3 +155,5 @@ daily-testing: script: - echo "Running the test..." + - ls + - env -- GitLab From 91d1b11c348b945d5eb43abccd66f0f2819a2c62 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 7 Dec 2021 14:42:23 +0000 Subject: [PATCH 061/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdf6dad..a69b82b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,7 @@ build: - openstack environment: name: staging + action: prepare artifacts: when: always -- GitLab From b7a4bc3372ae6f5fc1e474c34c582e034c7f0d9a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 13:14:42 +0000 Subject: [PATCH 062/235] Added deploy scripts --- .gitlab-ci.yml | 82 ++------------------------------------------ deploy.py | 87 +++++++++++++++++++++++++++++++++++++++++++++++ scripts/deploy.sh | 38 +++++++++++++++++++++ 3 files changed, 127 insertions(+), 80 deletions(-) create mode 100644 deploy.py create mode 100644 scripts/deploy.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a69b82b..b10f6b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,89 +44,11 @@ build: - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - ls -a - - - #Docker setup - - sudo apt install docker.io -y - - sudo usermod -aG docker $USER - - newgrp docker - - | - cat << EOF | sudo tee /etc/docker/daemon.json - { - "registry-mirrors": ["http://172.21.1.1:5000"] - } - EOF - - sudo chmod 666 /var/run/docker.sock - - sudo systemctl daemon-reload - - sudo service docker restart - - - - echo "OSM Installation" #Charmed OSM - - export PATH=/snap/bin:$PATH - - wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh - - chmod +x ./install_osm.sh - - sudo snap install microk8s --classic --channel=1.20/stable - - sudo sed -i "s|https://registry-1.docker.io|http://172.21.1.1:5000|" /var/snap/microk8s/current/args/containerd-template.toml - - sudo systemctl restart snap.microk8s.daemon-containerd.service - - sudo snap alias microk8s.kubectl kubectl - - ./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log - - script: - - echo "OSM Robot Testing" - - #Configuring ENV variables - source hive/openstack-etsi.rc - - export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 - - export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") - - export PROMETHEUS_PORT=80 - - 'export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs)' - - #Creating envfile - - echo "Creating envfile" - - | - cat << EOF >> robot-systest.cfg - VIM_TARGET=osm - VIM_MGMT_NET=osm-ext - ENVIRONMENTS_FOLDER=environments - PACKAGES_FOLDER=/robot-systest/osm-packages - OS_CLOUD=openstack - LC_ALL=C.UTF-8 - LANG=C.UTF-8 - EOF - - - envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg - - cat robot-systest.cfg - - #Creating clouds.yaml file - - echo "Creating clouds.yaml file" - - | - source /$(pwd)/hive/openstack-etsi.rc - cat << EOF > clouds.yaml - clouds: - openstack: - auth: - auth_url: $OS_AUTH_URL - project_name: $OS_PROJECT_NAME - username: $OS_USERNAME - password: $OS_PASSWORD - user_domain_name: $OS_USER_DOMAIN_NAME - project_domain_name: $OS_PROJECT_DOMAIN_ID - EOF - - cat clouds.yaml - #Creating Docker container - - > - docker run --env OSM_HOSTNAME=$OSM_HOSTNAME - --env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME - --env PROMETHEUS_PORT=$PROMETHEUS_PORT - --env JUJU_PASSWORD=$JUJU_PASSWORD - --env-file robot-systest.cfg - -v /clouds.yaml:/etc/openstack/clouds.yaml - -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config - -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ - opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing + - curl + - python3 deploy.py > artifacts/deploy.log after_script: - export PATH=/snap/bin:$PATH diff --git a/deploy.py b/deploy.py new file mode 100644 index 0000000..a9c8cb1 --- /dev/null +++ b/deploy.py @@ -0,0 +1,87 @@ +import requests +import os +import time +import subprocess + +imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" +flavorRef = "m1.xlarge" +networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" +vmName = "VM-Test" +keyName = "SSH" + +def getAuth(): + #Source clouds.yaml/openstack.rc file first + url = "{}/auth/tokens?nocatalog".format(os.environ.get('OS_AUTH_URL')) + header = {"Content-Type": "application/json"} + payload = '{ "auth": { "identity": { "methods": ["password"],"password": {"user": {"domain": {"name": "%s"},"name": "%s", "password": "%s"} } }, "scope": { "project": { "domain": { "name": "%s"}, "name": "%s"} } }}' % (os.environ.get("OS_USER_DOMAIN_NAME"), os.environ.get("OS_USERNAME"), os.environ.get("OS_PASSWORD"), os.environ.get("OS_PROJECT_DOMAIN_NAME"), os.environ.get("OS_PROJECT_NAME")) + res = requests.post(url, headers=header, data=payload) + print(res.status_code) + + if res.status_code == 201: + print("Yay") + token = res.headers['X-Subject-Token'] + # print(token) + os.environ["OS_TOKEN"] = token + print(os.environ.get('OS_TOKEN')) + else: + print("Nay") + +def computeRequest(method, endpoint, payload): + url = os.environ.get('OS_COMPUTE_API') + header = {"Content-Type": "application/json", "X-Auth-Token": os.environ.get('OS_TOKEN')} + print("{} : {}/{}".format(method, url, endpoint)) + res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) + return res + +#Requesting openstack auth token +getAuth() +os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" +#res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) +#print(res.text) + +#Tests +print('\n\nFlavors:\n') +res = computeRequest("GET", "flavors", None) +print(res.text) + +print('\n\nImages:\n') +res = computeRequest("GET", "images", None) +print(res.text) + + + +#Creating new server +payload = '{"server": {"name": "%s", "imageRef": "%s", "flavorRef": "%s", "networks": [{"uuid": "%s"}], "key_name": "%s"}}' % (vmName, imageRef, flavorRef, networkId, keyName) +res = computeRequest("POST", "servers", payload) +print("\n\n\n") +id = (res.json())['server']['id'] +print(id) + +res = computeRequest("GET", "flavors", None) +print(res.text) +time.sleep(30) + +#TODO: Storing credentials in GitLab + +res = computeRequest("GET", "servers/{}".format(id), None) +ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] +print(ip) + +subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True) + +#Copying scripts to deployment server +subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True) + +#Connecting via SSH & installing OSM +#subprocess.run(["ssh -o StrictHostKeyChecking=no ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True) +subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True) + +""" +#Cleaning up +print("\n\n\n") +time.sleep(15) +print("Cleaning up...") +payload = '{"rebuild": {"imageRef": "%s"}}' % (imageRef) +res = computeRequest("servers/{}/action".format(id), payload) + +""" diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100644 index 0000000..5d63a98 --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +echo "Installing" + +mkdir artifacts +mkdir reports +sudo apt-get update +sudo apt-get install -y \ + ca-certificates \ + curl \ + gnupg \ + lsb-release +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg +echo \ +"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ +$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null +sudo apt-get update # +#Docker setup +sudo apt-get install docker-ce docker-ce-cli containerd.io -y +cat << EOF | sudo tee /etc/docker/daemon.json +{ +"registry-mirrors": ["http://172.21.1.1:5000"] +} +EOF +sudo chmod 666 /var/run/docker.sock +sudo systemctl daemon-reload +sudo systemctl restart docker.service + +echo "OSM Installation" #Charmed OSM +export PATH=/snap/bin:$PATH +wget https://osm-download.etsi.org/ftp/osm-10.0-ten/install_osm.sh +chmod +x ./install_osm.sh +sudo snap install microk8s --classic --channel=1.20/stable +sudo sed -i "s|https://registry-1.docker.io|http://172.21.1.1:5000|" /var/snap/microk8s/current/args/containerd-template.toml +sudo systemctl restart snap.microk8s.daemon-containerd.service +sudo snap alias microk8s.kubectl kubectl +./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log +rm install_osm.sh -- GitLab From 040b0ec8540e12d96cd2ae277cd6f947e2866aef Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 13:20:19 +0000 Subject: [PATCH 063/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b10f6b1..534c792 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,8 @@ build: script: - source hive/openstack-etsi.rc - - curl + - ls + - python3 --version - python3 deploy.py > artifacts/deploy.log after_script: -- GitLab From 001269828993f09639b5db9b7d20fbf9b9a83838 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 13:33:19 +0000 Subject: [PATCH 064/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 534c792..901a530 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ build: script: - source hive/openstack-etsi.rc - + - echo $OS_AUTH_URL - ls - python3 --version - python3 deploy.py > artifacts/deploy.log -- GitLab From 3a20d9881b60c553e0a069f62f2cb61f16294b5b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 13:46:25 +0000 Subject: [PATCH 065/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 901a530..2b21588 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,6 +45,7 @@ build: - sudo apt-get install gitlab-runner script: + - set -a - source hive/openstack-etsi.rc - echo $OS_AUTH_URL - ls -- GitLab From 1eb598a20bf7ffe7a2373da3710795815dc4f0e0 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 14:06:24 +0000 Subject: [PATCH 066/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b21588..8e736cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,40 @@ build: script: - set -a - source hive/openstack-etsi.rc + + #Creating envfile + - echo "Creating envfile" + - | + cat << EOF >> robot-systest.cfg + VIM_TARGET=osm + VIM_MGMT_NET=osm-ext + ENVIRONMENTS_FOLDER=environments + PACKAGES_FOLDER=/robot-systest/osm-packages + OS_CLOUD=openstack + LC_ALL=C.UTF-8 + LANG=C.UTF-8 + EOF + + - envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg + - cat robot-systest.cfg + + #Creating clouds.yaml file + - echo "Creating clouds.yaml file" + - | + source /$(pwd)/hive/openstack-etsi.rc + cat << EOF > clouds.yaml + clouds: + openstack: + auth: + auth_url: $OS_AUTH_URL + project_name: $OS_PROJECT_NAME + username: $OS_USERNAME + password: $OS_PASSWORD + user_domain_name: $OS_USER_DOMAIN_NAME + project_domain_name: $OS_PROJECT_DOMAIN_ID + EOF + - cat clouds.yaml + - echo $OS_AUTH_URL - ls - python3 --version -- GitLab From 301237a6a7ac71d23496cd964b071fe2cd4d3dcd Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 14:13:52 +0000 Subject: [PATCH 067/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e736cc..8df91c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ stages: build: stage: build - when: manual + #when: manual tags: - openstack environment: @@ -48,6 +48,9 @@ build: - set -a - source hive/openstack-etsi.rc + - echo $OS_PASSWORD + + #Creating envfile - echo "Creating envfile" - | @@ -64,9 +67,13 @@ build: - envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg - cat robot-systest.cfg + + - echo $OS_PASSWORD + #Creating clouds.yaml file - echo "Creating clouds.yaml file" - | + set -a source /$(pwd)/hive/openstack-etsi.rc cat << EOF > clouds.yaml clouds: @@ -81,7 +88,7 @@ build: EOF - cat clouds.yaml - - echo $OS_AUTH_URL + - echo $OS_PASSWORD - ls - python3 --version - python3 deploy.py > artifacts/deploy.log -- GitLab From 481de2cef0e00ee6f645971bbf38b0abc3de7c99 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 14:19:22 +0000 Subject: [PATCH 068/235] Fixed deploy.py env var --- .gitlab-ci.yml | 40 ---------------------------------------- deploy.py | 2 +- hive/openstack-etsi.rc | 1 + 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8df91c0..44b6662 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,46 +48,6 @@ build: - set -a - source hive/openstack-etsi.rc - - echo $OS_PASSWORD - - - #Creating envfile - - echo "Creating envfile" - - | - cat << EOF >> robot-systest.cfg - VIM_TARGET=osm - VIM_MGMT_NET=osm-ext - ENVIRONMENTS_FOLDER=environments - PACKAGES_FOLDER=/robot-systest/osm-packages - OS_CLOUD=openstack - LC_ALL=C.UTF-8 - LANG=C.UTF-8 - EOF - - - envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg - - cat robot-systest.cfg - - - - echo $OS_PASSWORD - - #Creating clouds.yaml file - - echo "Creating clouds.yaml file" - - | - set -a - source /$(pwd)/hive/openstack-etsi.rc - cat << EOF > clouds.yaml - clouds: - openstack: - auth: - auth_url: $OS_AUTH_URL - project_name: $OS_PROJECT_NAME - username: $OS_USERNAME - password: $OS_PASSWORD - user_domain_name: $OS_USER_DOMAIN_NAME - project_domain_name: $OS_PROJECT_DOMAIN_ID - EOF - - cat clouds.yaml - - echo $OS_PASSWORD - ls - python3 --version diff --git a/deploy.py b/deploy.py index a9c8cb1..68b43f2 100644 --- a/deploy.py +++ b/deploy.py @@ -13,7 +13,7 @@ def getAuth(): #Source clouds.yaml/openstack.rc file first url = "{}/auth/tokens?nocatalog".format(os.environ.get('OS_AUTH_URL')) header = {"Content-Type": "application/json"} - payload = '{ "auth": { "identity": { "methods": ["password"],"password": {"user": {"domain": {"name": "%s"},"name": "%s", "password": "%s"} } }, "scope": { "project": { "domain": { "name": "%s"}, "name": "%s"} } }}' % (os.environ.get("OS_USER_DOMAIN_NAME"), os.environ.get("OS_USERNAME"), os.environ.get("OS_PASSWORD"), os.environ.get("OS_PROJECT_DOMAIN_NAME"), os.environ.get("OS_PROJECT_NAME")) + payload = '{ "auth": { "identity": { "methods": ["password"],"password": {"user": {"domain": {"name": "%s"},"name": "%s", "password": "%s"} } }, "scope": { "project": { "domain": { "name": "%s"}, "name": "%s"} } }}' % (os.environ.get("OS_USER_DOMAIN_NAME"), os.environ.get("OS_USERNAME"), os.environ.get("OS_PASSWORD"), os.environ.get("OS_PROJECT_DOMAIN_ID"), os.environ.get("OS_PROJECT_NAME")) res = requests.post(url, headers=header, data=payload) print(res.status_code) diff --git a/hive/openstack-etsi.rc b/hive/openstack-etsi.rc index 1481ba2..2e78d9a 100644 --- a/hive/openstack-etsi.rc +++ b/hive/openstack-etsi.rc @@ -8,3 +8,4 @@ OS_PASSWORD=$ETSI_VIM_PASSWORD OS_REGION_NAME=RegionOne OS_INTERFACE=public OS_IDENTITY_API_VERSION=3 + -- GitLab From 5cdd9b1296764f941296d0084369fc8fabb81411 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 14:28:14 +0000 Subject: [PATCH 069/235] Update deploy.py --- deploy.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/deploy.py b/deploy.py index 68b43f2..c7ab4e5 100644 --- a/deploy.py +++ b/deploy.py @@ -3,11 +3,11 @@ import os import time import subprocess -imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" +imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" flavorRef = "m1.xlarge" -networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" +networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" # vmName = "VM-Test" -keyName = "SSH" +keyName = "SSH" # def getAuth(): #Source clouds.yaml/openstack.rc file first @@ -48,6 +48,14 @@ print('\n\nImages:\n') res = computeRequest("GET", "images", None) print(res.text) +print('\n\nNetworks:\n') +res = computeRequest("GET", "os-networks", None) +print(res.text) + +print('\n\nKeys:\n') +res = computeRequest("GET", "os-keypairs", None) +print(res.text) + #Creating new server -- GitLab From 0ee5ab196984de87d91a390ca6badc2b301743c3 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 14:35:44 +0000 Subject: [PATCH 070/235] Update deploy.py --- deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index c7ab4e5..b7d780a 100644 --- a/deploy.py +++ b/deploy.py @@ -5,9 +5,9 @@ import subprocess imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" flavorRef = "m1.xlarge" -networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" # +networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" vmName = "VM-Test" -keyName = "SSH" # +keyName = "CICD" # def getAuth(): #Source clouds.yaml/openstack.rc file first -- GitLab From 5529ad0f60ce0aa93805470d0c584fdb01bba50a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 14:49:48 +0000 Subject: [PATCH 071/235] Update deploy.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 2 +- deploy.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44b6662..aba4736 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,7 +51,7 @@ build: - echo $OS_PASSWORD - ls - python3 --version - - python3 deploy.py > artifacts/deploy.log + - python3 deploy.py after_script: - export PATH=/snap/bin:$PATH diff --git a/deploy.py b/deploy.py index b7d780a..b1566c9 100644 --- a/deploy.py +++ b/deploy.py @@ -7,7 +7,7 @@ imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" flavorRef = "m1.xlarge" networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" vmName = "VM-Test" -keyName = "CICD" # +keyName = "CICD" def getAuth(): #Source clouds.yaml/openstack.rc file first @@ -61,6 +61,7 @@ print(res.text) #Creating new server payload = '{"server": {"name": "%s", "imageRef": "%s", "flavorRef": "%s", "networks": [{"uuid": "%s"}], "key_name": "%s"}}' % (vmName, imageRef, flavorRef, networkId, keyName) res = computeRequest("POST", "servers", payload) +print(res.text) print("\n\n\n") id = (res.json())['server']['id'] print(id) @@ -75,14 +76,14 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) -subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True) +subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server -subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True) +subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM #subprocess.run(["ssh -o StrictHostKeyChecking=no ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True) -subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True) +subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up -- GitLab From 761596eeb3200d87305b6b30aacba7767d37d8db Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 17 Dec 2021 14:55:11 +0000 Subject: [PATCH 072/235] Update deploy.py --- deploy.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index b1566c9..595d443 100644 --- a/deploy.py +++ b/deploy.py @@ -34,6 +34,8 @@ def computeRequest(method, endpoint, payload): return res #Requesting openstack auth token + +subprocess.run(["Hello World"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) @@ -76,13 +78,13 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) + subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM -#subprocess.run(["ssh -o StrictHostKeyChecking=no ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True) subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ -- GitLab From 4faf1e9849c3cdeb5e6a22bfa817cb79886730b0 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 09:22:03 +0000 Subject: [PATCH 073/235] Update deploy.py, hive/openstack-etsi.rc files --- deploy.py | 5 +++-- hive/openstack-etsi.rc | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index 595d443..4d5d8a0 100644 --- a/deploy.py +++ b/deploy.py @@ -35,13 +35,14 @@ def computeRequest(method, endpoint, payload): #Requesting openstack auth token -subprocess.run(["Hello World"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) #print(res.text) #Tests +""" print('\n\nFlavors:\n') res = computeRequest("GET", "flavors", None) print(res.text) @@ -57,7 +58,7 @@ print(res.text) print('\n\nKeys:\n') res = computeRequest("GET", "os-keypairs", None) print(res.text) - +""" #Creating new server diff --git a/hive/openstack-etsi.rc b/hive/openstack-etsi.rc index 2e78d9a..1b1b72c 100644 --- a/hive/openstack-etsi.rc +++ b/hive/openstack-etsi.rc @@ -8,4 +8,5 @@ OS_PASSWORD=$ETSI_VIM_PASSWORD OS_REGION_NAME=RegionOne OS_INTERFACE=public OS_IDENTITY_API_VERSION=3 +OS_COMPUTE_API=http://172.21.247.1:8774/v2.1 -- GitLab From 24e2b625c95d356cf151b34948aeb2237ec9c1d3 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 09:30:40 +0000 Subject: [PATCH 074/235] Update deploy.py --- deploy.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deploy.py b/deploy.py index 4d5d8a0..70bc658 100644 --- a/deploy.py +++ b/deploy.py @@ -35,7 +35,7 @@ def computeRequest(method, endpoint, payload): #Requesting openstack auth token -subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.STDOUT, stderr=subprocess.STDERR) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) @@ -69,8 +69,6 @@ print("\n\n\n") id = (res.json())['server']['id'] print(id) -res = computeRequest("GET", "flavors", None) -print(res.text) time.sleep(30) #TODO: Storing credentials in GitLab -- GitLab From edf82173b472c41006c7f6eaa998859dc28bf94f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 09:34:04 +0000 Subject: [PATCH 075/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 70bc658..3d9b538 100644 --- a/deploy.py +++ b/deploy.py @@ -35,7 +35,7 @@ def computeRequest(method, endpoint, payload): #Requesting openstack auth token -subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.STDOUT, stderr=subprocess.STDERR) +subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.STDOUT, stderr=subprocess.STDOUT) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) -- GitLab From 04acaa5085eae3da78d7b05bf6cd41562607fa96 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 09:42:04 +0000 Subject: [PATCH 076/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 3d9b538..fe7d306 100644 --- a/deploy.py +++ b/deploy.py @@ -35,7 +35,7 @@ def computeRequest(method, endpoint, payload): #Requesting openstack auth token -subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.STDOUT, stderr=subprocess.STDOUT) +subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) -- GitLab From b13c68efa5082f78db4ea79ed78eb5844a2f0032 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 09:49:49 +0000 Subject: [PATCH 077/235] Update deploy.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 1 + deploy.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aba4736..112b46a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,7 @@ build: - ls - python3 --version - python3 deploy.py + - ls after_script: - export PATH=/snap/bin:$PATH diff --git a/deploy.py b/deploy.py index fe7d306..80e6943 100644 --- a/deploy.py +++ b/deploy.py @@ -35,7 +35,7 @@ def computeRequest(method, endpoint, payload): #Requesting openstack auth token -subprocess.run(["echo 'Hello World'"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) +subprocess.run(["touch TEST"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) -- GitLab From 6dee071b47e3439caa42e05771023b269429d0ba Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 10:06:03 +0000 Subject: [PATCH 078/235] Update deploy.py --- deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index 80e6943..deac19b 100644 --- a/deploy.py +++ b/deploy.py @@ -81,10 +81,10 @@ print(ip) subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server -subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM -subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up -- GitLab From a563ca0f565b21a7dc6e310bceba8321403c7a1e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 10:15:02 +0000 Subject: [PATCH 079/235] Update deploy.py --- deploy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index deac19b..bc50763 100644 --- a/deploy.py +++ b/deploy.py @@ -35,7 +35,7 @@ def computeRequest(method, endpoint, payload): #Requesting openstack auth token -subprocess.run(["touch TEST"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) +subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) @@ -79,6 +79,7 @@ print(ip) subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From e70ca54ab4675febeee11ede73e98ae8efb19669 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 10:20:19 +0000 Subject: [PATCH 080/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index bc50763..3b05843 100644 --- a/deploy.py +++ b/deploy.py @@ -34,7 +34,7 @@ def computeRequest(method, endpoint, payload): return res #Requesting openstack auth token - +subprocess.run(["echo 'Test'"], shell=False) subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" -- GitLab From 326d71b0cac61c3938f1c485039633fcfc10db56 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 10:24:46 +0000 Subject: [PATCH 081/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 3b05843..221b166 100644 --- a/deploy.py +++ b/deploy.py @@ -34,7 +34,7 @@ def computeRequest(method, endpoint, payload): return res #Requesting openstack auth token -subprocess.run(["echo 'Test'"], shell=False) +subprocess.run(["echo", "Test"], shell=False) subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" -- GitLab From 7414d503978e9ec2bd9024e945876669f557c09d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 10:31:28 +0000 Subject: [PATCH 082/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 221b166..6e40b8b 100644 --- a/deploy.py +++ b/deploy.py @@ -35,7 +35,7 @@ def computeRequest(method, endpoint, payload): #Requesting openstack auth token subprocess.run(["echo", "Test"], shell=False) -subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) +subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True) getAuth() os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) -- GitLab From 2f0ba10472e11200288e329ba0e0e533118ab90f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 10:45:17 +0000 Subject: [PATCH 083/235] Update deploy.py --- deploy.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/deploy.py b/deploy.py index 6e40b8b..f9e75e4 100644 --- a/deploy.py +++ b/deploy.py @@ -77,15 +77,17 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) - -subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", ".ssh/known_hosts"], shell=False) +#subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server -subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["scp", "-r", "scripts/", "ubuntu@{}:~/".format(ip)], shell=False) +#subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM -subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) +#subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up -- GitLab From d153d8fe21d9671bd2e5cff6ea579e77230bab9d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 14:56:06 +0000 Subject: [PATCH 084/235] Update deploy.py --- deploy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy.py b/deploy.py index f9e75e4..082a86e 100644 --- a/deploy.py +++ b/deploy.py @@ -1,13 +1,13 @@ import requests import os import time -import subprocess +- imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" flavorRef = "m1.xlarge" networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" vmName = "VM-Test" -keyName = "CICD" +keyName = "SSH" def getAuth(): #Source clouds.yaml/openstack.rc file first @@ -77,7 +77,7 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) -subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", ".ssh/known_hosts"], shell=False) +subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) #subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From aedac9fba97450756203e454ee28ff4f5215309a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 14:59:01 +0000 Subject: [PATCH 085/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 082a86e..c173aa0 100644 --- a/deploy.py +++ b/deploy.py @@ -1,7 +1,7 @@ import requests import os import time -- +import subprocess imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" flavorRef = "m1.xlarge" -- GitLab From 9ab74038805b9ded853ca897c9f797855bdc0ac6 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 15:55:32 +0000 Subject: [PATCH 086/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 112b46a..4eb8204 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ variables: TESTS_VERSION: "2.7.1" ETSI_VIM_PASSWORD: $ETSI_VIM_PASSWORD + SSH_KEY: $SSH_KEY #HIVE_PATH: "~/builds/gitlab/devops/cicd/hive" stages: @@ -44,6 +45,8 @@ build: - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner + - echo -e $SSH_KEY >> ~/.ssh/id_rsa + script: - set -a - source hive/openstack-etsi.rc -- GitLab From 12e480e39cb109d825b3dddac7028a489433b636 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 15:57:07 +0000 Subject: [PATCH 087/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4eb8204..2ca8521 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,6 +46,7 @@ build: - sudo apt-get install gitlab-runner - echo -e $SSH_KEY >> ~/.ssh/id_rsa + - chmod 600 ~/.ssh/id_rsa script: - set -a -- GitLab From 9d20b63587bf3803b43616c0401fc93d8b3e631d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 20 Dec 2021 16:10:49 +0000 Subject: [PATCH 088/235] Update deploy.py --- deploy.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy.py b/deploy.py index c173aa0..2d62498 100644 --- a/deploy.py +++ b/deploy.py @@ -77,17 +77,17 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) -subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) -#subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) +subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server -subprocess.run(["scp", "-r", "scripts/", "ubuntu@{}:~/".format(ip)], shell=False) -#subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#subprocess.run(["scp", "-r", "scripts/", "ubuntu@{}:~/".format(ip)], shell=False) +subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM -subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) -#subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) +subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up -- GitLab From 6de21fb43620cd14edf18f0113a6f0622dcd15c8 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 12:41:19 +0000 Subject: [PATCH 089/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ca8521..e5fff58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,12 +41,18 @@ build: before_script: - mkdir artifacts - mkdir reports + - ls .ssh/ + + - echo -e $SSH_KEY >> ~/.ssh/id_rsa + - chmod 600 ~/.ssh/id_rsa + + - ls .ssh/ + + - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner - - echo -e $SSH_KEY >> ~/.ssh/id_rsa - - chmod 600 ~/.ssh/id_rsa script: - set -a -- GitLab From 75fb975de00deb55fb978390092bdca0b0ef62bd Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 12:43:01 +0000 Subject: [PATCH 090/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5fff58..224a05d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,12 +41,13 @@ build: before_script: - mkdir artifacts - mkdir reports - - ls .ssh/ + - ls + - ls ~/.ssh/ - echo -e $SSH_KEY >> ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - ls .ssh/ + - ls ~/.ssh/ - echo "GitLab Runner Installation" -- GitLab From 52b179f2abd73f5213f8c34f754097514ece4071 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 12:50:02 +0000 Subject: [PATCH 091/235] Update deploy.py --- deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index 2d62498..2360c22 100644 --- a/deploy.py +++ b/deploy.py @@ -87,8 +87,8 @@ subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], #Connecting via SSH & installing OSM #subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) -subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - +#subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'touch TEST.txt' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up print("\n\n\n") -- GitLab From 647e5aa4f2500b9580f90945004437d4374dd9dc Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 13:01:08 +0000 Subject: [PATCH 092/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 2360c22..a786f0e 100644 --- a/deploy.py +++ b/deploy.py @@ -83,7 +83,7 @@ subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell #Copying scripts to deployment server #subprocess.run(["scp", "-r", "scripts/", "ubuntu@{}:~/".format(ip)], shell=False) -subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM #subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) -- GitLab From a8cdecaa36433f7c624de8acba6595c29866af00 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 13:12:23 +0000 Subject: [PATCH 093/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index a786f0e..3d2a3c3 100644 --- a/deploy.py +++ b/deploy.py @@ -88,7 +88,7 @@ subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell #Connecting via SSH & installing OSM #subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) #subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -subprocess.run(["ssh ubuntu@{} 'touch TEST.txt' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up print("\n\n\n") -- GitLab From 6d5c2e1e11108000bd8438b592c1016b6ec4b6db Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 13:52:23 +0000 Subject: [PATCH 094/235] Update deploy.py --- deploy.py | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy.py b/deploy.py index 3d2a3c3..2fb995d 100644 --- a/deploy.py +++ b/deploy.py @@ -78,6 +78,7 @@ ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) #subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) +subprocess.run(["cat ~/.ssh/known_hosts > artifacts/BEFORE_KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From ada321a489f52d4af9a6fff14f2a6c35b48494db Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 14:06:39 +0000 Subject: [PATCH 095/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 2fb995d..06662b8 100644 --- a/deploy.py +++ b/deploy.py @@ -89,7 +89,7 @@ subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell #Connecting via SSH & installing OSM #subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) #subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -subprocess.run(["ssh ubuntu@{} 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} -o StrictHostKeyChecking=no 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up print("\n\n\n") -- GitLab From cf7cbd8cfaf617f3fc75bbcac372e35359ebc859 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 14:32:14 +0000 Subject: [PATCH 096/235] Update .gitlab-ci.yml, deploy.py files --- .gitlab-ci.yml | 2 +- deploy.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 224a05d..5f47463 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ build: - ls - ls ~/.ssh/ - - echo -e $SSH_KEY >> ~/.ssh/id_rsa + - echo -e $SSH_KEY > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ls ~/.ssh/ diff --git a/deploy.py b/deploy.py index 06662b8..9cbf16f 100644 --- a/deploy.py +++ b/deploy.py @@ -79,7 +79,9 @@ print(ip) #subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) subprocess.run(["cat ~/.ssh/known_hosts > artifacts/BEFORE_KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + +subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server @@ -89,7 +91,7 @@ subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell #Connecting via SSH & installing OSM #subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) #subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -subprocess.run(["ssh ubuntu@{} -o StrictHostKeyChecking=no 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up print("\n\n\n") -- GitLab From bd48940d1c1a947f6bc24d7ff6b347cfe042d8ac Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 14:51:50 +0000 Subject: [PATCH 097/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f47463..5b0045e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,6 +48,7 @@ build: - chmod 600 ~/.ssh/id_rsa - ls ~/.ssh/ + - wc -l ~/.ssh/id_rsa - echo "GitLab Runner Installation" -- GitLab From 35e6d347455818fd98996483c6fcc37c1518a846 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 14:55:42 +0000 Subject: [PATCH 098/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b0045e..c069d13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ build: - ls - ls ~/.ssh/ - - echo -e $SSH_KEY > ~/.ssh/id_rsa + - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ls ~/.ssh/ -- GitLab From 8d59f0d8dc50c2d1605360c483f53c9bc72b10a9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 21 Dec 2021 15:01:11 +0000 Subject: [PATCH 099/235] Update deploy.py --- deploy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy.py b/deploy.py index 9cbf16f..1eda8e9 100644 --- a/deploy.py +++ b/deploy.py @@ -86,12 +86,12 @@ subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell #Copying scripts to deployment server #subprocess.run(["scp", "-r", "scripts/", "ubuntu@{}:~/".format(ip)], shell=False) -#subprocess.run(["scp -r scripts/ ubuntu@{}:~/ > artifacts/SCP.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM #subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) -#subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -subprocess.run(["ssh ubuntu@{} 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#subprocess.run(["ssh ubuntu@{} 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) """ #Cleaning up print("\n\n\n") -- GitLab From 095706685c314c0142d045ee7b172becc9fb1ad7 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 08:38:16 +0000 Subject: [PATCH 100/235] Update deploy.py --- deploy.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/deploy.py b/deploy.py index 1eda8e9..c0e9c0b 100644 --- a/deploy.py +++ b/deploy.py @@ -33,6 +33,13 @@ def computeRequest(method, endpoint, payload): res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) return res +def gitlabRequest(method, endpoint, payload): + url = os.environ.get('GITLAB_API') + header = {"Authorization': 'Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + print("{} : {}/{}".format(method, url, endpoint)) + res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) + return res + #Requesting openstack auth token subprocess.run(["echo", "Test"], shell=False) subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True) @@ -72,6 +79,13 @@ print(id) time.sleep(30) #TODO: Storing credentials in GitLab +res = gitlabRequest("GET", "variables/TEST", None) + +print("Var = ", res['value']) + +res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) + + res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] -- GitLab From 610fb4ee42a293b43716e40a600ed04b9bed68fb Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 08:45:29 +0000 Subject: [PATCH 101/235] Update .gitlab-ci.yml, deploy.py files --- .gitlab-ci.yml | 2 ++ deploy.py | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c069d13..49f0143 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,8 @@ variables: TESTS_VERSION: "2.7.1" ETSI_VIM_PASSWORD: $ETSI_VIM_PASSWORD SSH_KEY: $SSH_KEY + GITLAB_API: $GITLAB_API + GITLAB_TOKEN: $GITLAB_TOKEN #HIVE_PATH: "~/builds/gitlab/devops/cicd/hive" stages: diff --git a/deploy.py b/deploy.py index c0e9c0b..79fc4a4 100644 --- a/deploy.py +++ b/deploy.py @@ -40,6 +40,15 @@ def gitlabRequest(method, endpoint, payload): res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) return res + +res = gitlabRequest("GET", "variables/TEST", None) + +print("Var = ", res['value']) + +res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) + +return 0 + #Requesting openstack auth token subprocess.run(["echo", "Test"], shell=False) subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True) @@ -79,11 +88,7 @@ print(id) time.sleep(30) #TODO: Storing credentials in GitLab -res = gitlabRequest("GET", "variables/TEST", None) -print("Var = ", res['value']) - -res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) -- GitLab From eff1618aeb9fc085ae9cf45070d1289032c58fdf Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 08:49:42 +0000 Subject: [PATCH 102/235] Update deploy.py --- deploy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 79fc4a4..00f35c9 100644 --- a/deploy.py +++ b/deploy.py @@ -2,6 +2,7 @@ import requests import os import time import subprocess +import sys imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" flavorRef = "m1.xlarge" @@ -47,7 +48,7 @@ print("Var = ", res['value']) res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) -return 0 +sys.exit() #Requesting openstack auth token subprocess.run(["echo", "Test"], shell=False) -- GitLab From c8a449d189a8e214aac0039535d7b5ab76fcb48f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 09:12:41 +0000 Subject: [PATCH 103/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 00f35c9..3efa9ae 100644 --- a/deploy.py +++ b/deploy.py @@ -36,7 +36,7 @@ def computeRequest(method, endpoint, payload): def gitlabRequest(method, endpoint, payload): url = os.environ.get('GITLAB_API') - header = {"Authorization': 'Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} print("{} : {}/{}".format(method, url, endpoint)) res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) return res -- GitLab From bf24dfc37f9e476cc8f444ef43eb2b2c119c691f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 09:16:29 +0000 Subject: [PATCH 104/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 3efa9ae..6113773 100644 --- a/deploy.py +++ b/deploy.py @@ -44,7 +44,7 @@ def gitlabRequest(method, endpoint, payload): res = gitlabRequest("GET", "variables/TEST", None) -print("Var = ", res['value']) +print("Var = ", res.text['value']) res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) -- GitLab From 02648b4a713a7f5948f7bbdc628ed216d6dba6e0 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 09:16:50 +0000 Subject: [PATCH 105/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 6113773..d47abd5 100644 --- a/deploy.py +++ b/deploy.py @@ -44,7 +44,7 @@ def gitlabRequest(method, endpoint, payload): res = gitlabRequest("GET", "variables/TEST", None) -print("Var = ", res.text['value']) +print("Var = ", res.json['value']) res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) -- GitLab From 6f31b3cea08383c17a83a91cd8cfdfedf635758d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 09:36:11 +0000 Subject: [PATCH 106/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index d47abd5..034a86a 100644 --- a/deploy.py +++ b/deploy.py @@ -44,7 +44,7 @@ def gitlabRequest(method, endpoint, payload): res = gitlabRequest("GET", "variables/TEST", None) -print("Var = ", res.json['value']) +print("Var = ", res.json()['value']) res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) -- GitLab From 44afe30223accd471cd4c1bba76c628adb95e885 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 09:40:02 +0000 Subject: [PATCH 107/235] Update deploy.py --- deploy.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy.py b/deploy.py index 034a86a..12b4f6b 100644 --- a/deploy.py +++ b/deploy.py @@ -44,6 +44,8 @@ def gitlabRequest(method, endpoint, payload): res = gitlabRequest("GET", "variables/TEST", None) +print(res.text) + print("Var = ", res.json()['value']) res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) -- GitLab From d15805d6b7efa901fdaa05ce759b8eb12bf5f7e9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:22:45 +0000 Subject: [PATCH 108/235] Update deploy.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 3 +++ deploy.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49f0143..51888c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,9 @@ build: - ls ~/.ssh/ - wc -l ~/.ssh/id_rsa + - export GITLAB_API + - export GITLAB_TOKEN + - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash diff --git a/deploy.py b/deploy.py index 12b4f6b..68f9c2d 100644 --- a/deploy.py +++ b/deploy.py @@ -41,7 +41,7 @@ def gitlabRequest(method, endpoint, payload): res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) return res - +source env.sh res = gitlabRequest("GET", "variables/TEST", None) print(res.text) -- GitLab From 8647702fad320e2245bd70cf1740bdd0fdb3ce6b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:25:44 +0000 Subject: [PATCH 109/235] Update deploy.py --- deploy.py | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy.py b/deploy.py index 68f9c2d..0de8ef3 100644 --- a/deploy.py +++ b/deploy.py @@ -41,7 +41,6 @@ def gitlabRequest(method, endpoint, payload): res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) return res -source env.sh res = gitlabRequest("GET", "variables/TEST", None) print(res.text) -- GitLab From 690486d9ff05806baad8680df0405fa3a879841e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:31:50 +0000 Subject: [PATCH 110/235] Update deploy.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 3 +++ deploy.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51888c5..a3c1a15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,6 +55,9 @@ build: - export GITLAB_API - export GITLAB_TOKEN + - echo GITLAB_TOKEN + - echo GITLAB_API + - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash diff --git a/deploy.py b/deploy.py index 0de8ef3..0396a8a 100644 --- a/deploy.py +++ b/deploy.py @@ -45,7 +45,7 @@ res = gitlabRequest("GET", "variables/TEST", None) print(res.text) -print("Var = ", res.json()['value']) +print(res.json()['value']) res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) -- GitLab From 08ec5843f023a71f2332eff37486163f51cf2bd5 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:34:42 +0000 Subject: [PATCH 111/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3c1a15..20d6be9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,8 +55,8 @@ build: - export GITLAB_API - export GITLAB_TOKEN - - echo GITLAB_TOKEN - - echo GITLAB_API + - echo $GITLAB_TOKEN + - echo $GITLAB_API - echo "GitLab Runner Installation" -- GitLab From 73b99252dad12c89e704f99368d86f5e002455e9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:38:50 +0000 Subject: [PATCH 112/235] Update deploy.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 1 + deploy.py | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20d6be9..3723416 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,6 +57,7 @@ build: - echo $GITLAB_TOKEN - echo $GITLAB_API + - echo $CI_ENVIRONMENT_NAME - echo "GitLab Runner Installation" diff --git a/deploy.py b/deploy.py index 0396a8a..102111d 100644 --- a/deploy.py +++ b/deploy.py @@ -37,6 +37,7 @@ def computeRequest(method, endpoint, payload): def gitlabRequest(method, endpoint, payload): url = os.environ.get('GITLAB_API') header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) return res -- GitLab From a840326d25ad53f11671a689538d73ec3445d092 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:42:31 +0000 Subject: [PATCH 113/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3723416..b63fa66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,8 +52,12 @@ build: - ls ~/.ssh/ - wc -l ~/.ssh/id_rsa + - env + + - export GITLAB_API - export GITLAB_TOKEN + - export CI_ENVIRONMENT_NAME - echo $GITLAB_TOKEN - echo $GITLAB_API -- GitLab From d2bb700274a48207b25a6f6d68fea997ca47efd4 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:45:35 +0000 Subject: [PATCH 114/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 102111d..4030ced 100644 --- a/deploy.py +++ b/deploy.py @@ -39,7 +39,7 @@ def gitlabRequest(method, endpoint, payload): header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) - res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) + res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res res = gitlabRequest("GET", "variables/TEST", None) -- GitLab From 2d9d00f499a6ad864ebd4ea90017a09025661019 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 12:54:39 +0000 Subject: [PATCH 115/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b63fa66..49f0143 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,17 +52,6 @@ build: - ls ~/.ssh/ - wc -l ~/.ssh/id_rsa - - env - - - - export GITLAB_API - - export GITLAB_TOKEN - - export CI_ENVIRONMENT_NAME - - - echo $GITLAB_TOKEN - - echo $GITLAB_API - - echo $CI_ENVIRONMENT_NAME - - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash -- GitLab From 46ac0443d57bad132377d8ac7f1a59e64c01b477 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 13:31:06 +0000 Subject: [PATCH 116/235] Update deploy.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 1 + deploy.py | 50 +++++++++++++++++--------------------------------- 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49f0143..157d361 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,7 @@ build: - artifacts before_script: + - mkdir artifacts - mkdir reports - ls diff --git a/deploy.py b/deploy.py index 4030ced..d7c914d 100644 --- a/deploy.py +++ b/deploy.py @@ -10,6 +10,13 @@ networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" vmName = "VM-Test" keyName = "SSH" +def cleanVM: + instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None)).text + res = computeRequest("DELETE", "servers/{}".format(instanceId), None) + print(res.status_code) + print(res.text) + + def getAuth(): #Source clouds.yaml/openstack.rc file first url = "{}/auth/tokens?nocatalog".format(os.environ.get('OS_AUTH_URL')) @@ -42,42 +49,16 @@ def gitlabRequest(method, endpoint, payload): res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res -res = gitlabRequest("GET", "variables/TEST", None) - -print(res.text) - -print(res.json()['value']) +#Requesting openstack auth token -res = gitlabRequest("PUT", "variables/TEST", {'value': 'xyz'}) +getAuth() -sys.exit() +#os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" -#Requesting openstack auth token -subprocess.run(["echo", "Test"], shell=False) -subprocess.run(["echo 'Test' > artifacts/TEST.log"], shell=True) -getAuth() -os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" +cleanVM() #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) #print(res.text) -#Tests -""" -print('\n\nFlavors:\n') -res = computeRequest("GET", "flavors", None) -print(res.text) - -print('\n\nImages:\n') -res = computeRequest("GET", "images", None) -print(res.text) - -print('\n\nNetworks:\n') -res = computeRequest("GET", "os-networks", None) -print(res.text) - -print('\n\nKeys:\n') -res = computeRequest("GET", "os-keypairs", None) -print(res.text) -""" #Creating new server @@ -92,13 +73,13 @@ time.sleep(30) #TODO: Storing credentials in GitLab - - - res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) +res = gitlabRequest("PUT", "variables/INSTANCE_ID", {'value': '{}'.format(id)}) + + #subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) subprocess.run(["cat ~/.ssh/known_hosts > artifacts/BEFORE_KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -114,6 +95,9 @@ subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True, stdout=s #subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #subprocess.run(["ssh ubuntu@{} 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + + """ #Cleaning up print("\n\n\n") -- GitLab From 50c0a95956ddde5a029c9704ca21de90cae7552d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 13:33:45 +0000 Subject: [PATCH 117/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index d7c914d..21703f4 100644 --- a/deploy.py +++ b/deploy.py @@ -10,7 +10,7 @@ networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" vmName = "VM-Test" keyName = "SSH" -def cleanVM: +def cleanVM(): instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None)).text res = computeRequest("DELETE", "servers/{}".format(instanceId), None) print(res.status_code) -- GitLab From 4bb888a8238c45c2a4fa460462d11839749e24f9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 14:02:19 +0000 Subject: [PATCH 118/235] Update deploy.py --- deploy.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 21703f4..6ca066e 100644 --- a/deploy.py +++ b/deploy.py @@ -77,7 +77,9 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) -res = gitlabRequest("PUT", "variables/INSTANCE_ID", {'value': '{}'.format(id)}) +res = gitlabRequest("POST", "variables/INSTANCE_ID", {'value': '{}'.format(id)}) +print(res.status_code) +print(res.text) #subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) -- GitLab From db4049fa2aad9f357489f9e4d854dbe5b6eef268 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 14:32:23 +0000 Subject: [PATCH 119/235] Update deploy.py --- deploy.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index 6ca066e..52fb100 100644 --- a/deploy.py +++ b/deploy.py @@ -44,7 +44,10 @@ def computeRequest(method, endpoint, payload): def gitlabRequest(method, endpoint, payload): url = os.environ.get('GITLAB_API') header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} - filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) + if method == 'PUT': + filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) + else: + filter = '' print("{} : {}/{}".format(method, url, endpoint)) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res @@ -58,8 +61,32 @@ getAuth() cleanVM() #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) #print(res.text) +payload = { + "variable_type": "env_var", + "key": "INSTANCE_ID", + "value": "ID", + "protected": false, + "masked": false, + "environment_scope": "$CI_ENVIRONMENT_NAME" +} + + +res = gitlabRequest("POST", "variables", payload) +print(res.text) +payload = { + "variable_type": "env_var", + "key": "INSTANCE_ID", + "value": "NEW ID", + "protected": false, + "masked": false, + "environment_scope": "$CI_ENVIRONMENT_NAME" +} +res = gitlabRequest("POST", "variables", payload) +print(res.text) + +sys.exit() #Creating new server payload = '{"server": {"name": "%s", "imageRef": "%s", "flavorRef": "%s", "networks": [{"uuid": "%s"}], "key_name": "%s"}}' % (vmName, imageRef, flavorRef, networkId, keyName) @@ -77,7 +104,9 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) -res = gitlabRequest("POST", "variables/INSTANCE_ID", {'value': '{}'.format(id)}) +#res = gitlabRequest("PUT", "variables/INSTANCE_ID", {'value': '{}'.format(id)}) + + print(res.status_code) print(res.text) -- GitLab From 723d4fa76e6aa20c5ec28f687131cf796ed10753 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 14:36:45 +0000 Subject: [PATCH 120/235] Update deploy.py --- deploy.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/deploy.py b/deploy.py index 52fb100..4d2cd01 100644 --- a/deploy.py +++ b/deploy.py @@ -61,27 +61,13 @@ getAuth() cleanVM() #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) #print(res.text) -payload = { - "variable_type": "env_var", - "key": "INSTANCE_ID", - "value": "ID", - "protected": false, - "masked": false, - "environment_scope": "$CI_ENVIRONMENT_NAME" -} +payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "ID","protected": false,"masked": false,"environment_scope": "$CI_ENVIRONMENT_NAME"}' res = gitlabRequest("POST", "variables", payload) print(res.text) -payload = { - "variable_type": "env_var", - "key": "INSTANCE_ID", - "value": "NEW ID", - "protected": false, - "masked": false, - "environment_scope": "$CI_ENVIRONMENT_NAME" -} +payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "NEW ID","protected": false,"masked": false,"environment_scope": "$CI_ENVIRONMENT_NAME"}' res = gitlabRequest("POST", "variables", payload) print(res.text) -- GitLab From ffce8e0c0163dcf6b1c09eaa8ab1d27640e9a3e8 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 14:41:12 +0000 Subject: [PATCH 121/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 4d2cd01..7dab4b2 100644 --- a/deploy.py +++ b/deploy.py @@ -43,7 +43,7 @@ def computeRequest(method, endpoint, payload): def gitlabRequest(method, endpoint, payload): url = os.environ.get('GITLAB_API') - header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} if method == 'PUT': filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) else: -- GitLab From 04979dd542878ebb75c73c4e808407f617f04284 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 14:53:58 +0000 Subject: [PATCH 122/235] Update deploy.py --- deploy.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/deploy.py b/deploy.py index 7dab4b2..40ea370 100644 --- a/deploy.py +++ b/deploy.py @@ -12,6 +12,7 @@ keyName = "SSH" def cleanVM(): instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None)).text + #TODO: Test 404 res = computeRequest("DELETE", "servers/{}".format(instanceId), None) print(res.status_code) print(res.text) @@ -56,12 +57,10 @@ def gitlabRequest(method, endpoint, payload): getAuth() -#os.environ['OS_COMPUTE_API'] = "http://172.21.247.1:8774/v2.1" - cleanVM() #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) #print(res.text) -payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "ID","protected": false,"masked": false,"environment_scope": "$CI_ENVIRONMENT_NAME"}' +payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "ID","protected": false,"masked": false,"environment_scope": "%s"}' % ($CI_ENVIRONMENT_NAME) res = gitlabRequest("POST", "variables", payload) @@ -90,6 +89,15 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) +if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): + #POST + payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "ID","protected": false,"masked": false,"environment_scope": "%s"}' % (os.environ.get('CI_ENVIRONMENT_NAME')) + res = gitlabRequest("POST", "variables", payload) + print(res.text) +else: + #PUT + res = gitlabRequest('PUT', 'variables/INSTANCE_ID', "{'value': '%s'}" % (id)) + #res = gitlabRequest("PUT", "variables/INSTANCE_ID", {'value': '{}'.format(id)}) -- GitLab From 93553b24348f025e5df212376a149d88a633b42d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 14:57:58 +0000 Subject: [PATCH 123/235] Update deploy.py --- deploy.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/deploy.py b/deploy.py index 40ea370..d775069 100644 --- a/deploy.py +++ b/deploy.py @@ -58,6 +58,8 @@ def gitlabRequest(method, endpoint, payload): getAuth() cleanVM() + +""" #res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) #print(res.text) payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "ID","protected": false,"masked": false,"environment_scope": "%s"}' % ($CI_ENVIRONMENT_NAME) @@ -73,6 +75,17 @@ print(res.text) sys.exit() +""" +if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): + #POST + payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "%s","protected": false,"masked": false,"environment_scope": "%s"}' % ("ID", os.environ.get('CI_ENVIRONMENT_NAME')) + res = gitlabRequest("POST", "variables", payload) + print(res.text) +else: + #PUT + res = gitlabRequest('PUT', 'variables/INSTANCE_ID', "{'value': '%s'}" % ("TEST")) + +sys.exit() #Creating new server payload = '{"server": {"name": "%s", "imageRef": "%s", "flavorRef": "%s", "networks": [{"uuid": "%s"}], "key_name": "%s"}}' % (vmName, imageRef, flavorRef, networkId, keyName) res = computeRequest("POST", "servers", payload) -- GitLab From c8f3f2e93be1fb9ea842e9a1fd42c0ba51a399a6 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 15:09:53 +0000 Subject: [PATCH 124/235] Update deploy.py --- deploy.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deploy.py b/deploy.py index d775069..93e8ad1 100644 --- a/deploy.py +++ b/deploy.py @@ -76,6 +76,8 @@ print(res.text) sys.exit() """ + + if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): #POST payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "%s","protected": false,"masked": false,"environment_scope": "%s"}' % ("ID", os.environ.get('CI_ENVIRONMENT_NAME')) @@ -84,8 +86,12 @@ if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): else: #PUT res = gitlabRequest('PUT', 'variables/INSTANCE_ID', "{'value': '%s'}" % ("TEST")) + print(res.status_code) + print(res.text) sys.exit() + + #Creating new server payload = '{"server": {"name": "%s", "imageRef": "%s", "flavorRef": "%s", "networks": [{"uuid": "%s"}], "key_name": "%s"}}' % (vmName, imageRef, flavorRef, networkId, keyName) res = computeRequest("POST", "servers", payload) -- GitLab From 83a755c4c3c33c45752c0e76c2ae203e12210c0e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 15:14:24 +0000 Subject: [PATCH 125/235] Update deploy.py --- deploy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 93e8ad1..91b0cd8 100644 --- a/deploy.py +++ b/deploy.py @@ -85,7 +85,8 @@ if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): print(res.text) else: #PUT - res = gitlabRequest('PUT', 'variables/INSTANCE_ID', "{'value': '%s'}" % ("TEST")) + payload = '{"value": "%s"}' % ("TEST") + res = gitlabRequest('PUT', 'variables/INSTANCE_ID', {"value": "TEST"}) print(res.status_code) print(res.text) -- GitLab From df5f0ea409977dff2adb2cad73b74a411b23d058 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 15:30:02 +0000 Subject: [PATCH 126/235] Update deploy.py --- deploy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 91b0cd8..dac8d54 100644 --- a/deploy.py +++ b/deploy.py @@ -50,6 +50,7 @@ def gitlabRequest(method, endpoint, payload): else: filter = '' print("{} : {}/{}".format(method, url, endpoint)) + print =(filter) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res @@ -85,7 +86,7 @@ if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): print(res.text) else: #PUT - payload = '{"value": "%s"}' % ("TEST") + #payload = '{"value": "%s"}' % ("TEST") res = gitlabRequest('PUT', 'variables/INSTANCE_ID', {"value": "TEST"}) print(res.status_code) print(res.text) -- GitLab From 599cd7ff33a866e06f8e117a78b5e5972c1b4a99 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 15:32:54 +0000 Subject: [PATCH 127/235] Update deploy.py --- deploy.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/deploy.py b/deploy.py index dac8d54..0904fc9 100644 --- a/deploy.py +++ b/deploy.py @@ -45,11 +45,12 @@ def computeRequest(method, endpoint, payload): def gitlabRequest(method, endpoint, payload): url = os.environ.get('GITLAB_API') header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} - if method == 'PUT': - filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) + if method == 'POST': + header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + filter = '' else: - filter = '' - print("{} : {}/{}".format(method, url, endpoint)) + header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) print =(filter) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res -- GitLab From 746666937e4fbd4b60fad411571181d4928b04b3 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 15:35:46 +0000 Subject: [PATCH 128/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 0904fc9..6a14261 100644 --- a/deploy.py +++ b/deploy.py @@ -47,7 +47,7 @@ def gitlabRequest(method, endpoint, payload): header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} if method == 'POST': header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} - filter = '' + filter = '' else: header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) -- GitLab From beafa520a1989977c3e373f1555101af7c9a7187 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 15:39:11 +0000 Subject: [PATCH 129/235] Update deploy.py --- deploy.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index 6a14261..ba7f2c2 100644 --- a/deploy.py +++ b/deploy.py @@ -50,7 +50,8 @@ def gitlabRequest(method, endpoint, payload): filter = '' else: header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} - filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) + filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) + print("{} : {}/{}".format(method, url, endpoint)) print =(filter) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res -- GitLab From 100696988a5c284d837d6223a1e8f2236f948539 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 23 Dec 2021 15:43:01 +0000 Subject: [PATCH 130/235] Update deploy.py --- deploy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index ba7f2c2..0070b0f 100644 --- a/deploy.py +++ b/deploy.py @@ -52,7 +52,7 @@ def gitlabRequest(method, endpoint, payload): header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) - print =(filter) + print(filter) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res -- GitLab From be1471935518ff9973a7fa1e1309320e6b30ab25 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 09:20:33 +0000 Subject: [PATCH 131/235] Update deploy.py --- deploy.py | 76 ++++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 62 deletions(-) diff --git a/deploy.py b/deploy.py index 0070b0f..6649890 100644 --- a/deploy.py +++ b/deploy.py @@ -56,44 +56,14 @@ def gitlabRequest(method, endpoint, payload): res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res -#Requesting openstack auth token - -getAuth() - -cleanVM() - -""" -#res = computeRequest("GET", "servers/daaa5436-ab55-4024-bf18-a28ebc5d3980", None) -#print(res.text) -payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "ID","protected": false,"masked": false,"environment_scope": "%s"}' % ($CI_ENVIRONMENT_NAME) - - -res = gitlabRequest("POST", "variables", payload) -print(res.text) - -payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "NEW ID","protected": false,"masked": false,"environment_scope": "$CI_ENVIRONMENT_NAME"}' -res = gitlabRequest("POST", "variables", payload) -print(res.text) - -sys.exit() -""" +#Requesting openstack auth token +getAuth() -if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): - #POST - payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "%s","protected": false,"masked": false,"environment_scope": "%s"}' % ("ID", os.environ.get('CI_ENVIRONMENT_NAME')) - res = gitlabRequest("POST", "variables", payload) - print(res.text) -else: - #PUT - #payload = '{"value": "%s"}' % ("TEST") - res = gitlabRequest('PUT', 'variables/INSTANCE_ID', {"value": "TEST"}) - print(res.status_code) - print(res.text) - -sys.exit() +#Deleting previous instance +cleanVM() #Creating new server @@ -106,52 +76,34 @@ print(id) time.sleep(30) -#TODO: Storing credentials in GitLab - -res = computeRequest("GET", "servers/{}".format(id), None) -ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] -print(ip) +#Storing instance ID in GitLab if (gitlabRequest('GET', 'variables/INSTANCE_ID', None).status_code == 404): #POST - payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "ID","protected": false,"masked": false,"environment_scope": "%s"}' % (os.environ.get('CI_ENVIRONMENT_NAME')) + payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "%s","protected": false,"masked": false,"environment_scope": "%s"}' % (id, os.environ.get('CI_ENVIRONMENT_NAME')) res = gitlabRequest("POST", "variables", payload) print(res.text) else: #PUT - res = gitlabRequest('PUT', 'variables/INSTANCE_ID', "{'value': '%s'}" % (id)) - -#res = gitlabRequest("PUT", "variables/INSTANCE_ID", {'value': '{}'.format(id)}) - + res = gitlabRequest('PUT', 'variables/INSTANCE_ID', {"value": "{}".format(id)}) + print(res.status_code) + print(res.text) print(res.status_code) print(res.text) -#subprocess.run(["ssh-keyscan", "-H", "{}".format(ip), ">>", "~/.ssh/known_hosts"], shell=False) -subprocess.run(["cat ~/.ssh/known_hosts > artifacts/BEFORE_KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -#subprocess.run(["ssh-keyscan -H {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#Retrieving instance ip +res = computeRequest("GET", "servers/{}".format(id), None) +ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] +print(ip) +#Adding ECDSA key to known hosts subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -subprocess.run(["cat ~/.ssh/known_hosts > artifacts/KEYS.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying scripts to deployment server -#subprocess.run(["scp", "-r", "scripts/", "ubuntu@{}:~/".format(ip)], shell=False) subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & installing OSM -#subprocess.run(["ssh"," ubuntu@{}".format(ip), 'chmod +x scripts/*.sh && scripts/deploy.sh'.format(ip)], shell=False) subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -#subprocess.run(["ssh ubuntu@{} 'touch TEST.txt'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - - - -""" -#Cleaning up -print("\n\n\n") -time.sleep(15) -print("Cleaning up...") -payload = '{"rebuild": {"imageRef": "%s"}}' % (imageRef) -res = computeRequest("servers/{}/action".format(id), payload) -""" -- GitLab From c0e07f27b802be7e7b3925aea0904359cd349b79 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 10:03:18 +0000 Subject: [PATCH 132/235] Update deploy.py --- deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index 6649890..e72826e 100644 --- a/deploy.py +++ b/deploy.py @@ -11,7 +11,7 @@ vmName = "VM-Test" keyName = "SSH" def cleanVM(): - instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None)).text + instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] #TODO: Test 404 res = computeRequest("DELETE", "servers/{}".format(instanceId), None) print(res.status_code) @@ -52,7 +52,7 @@ def gitlabRequest(method, endpoint, payload): header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) - print(filter) + #print(filter) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res -- GitLab From 6bf85f3834d746819ef99fb3cc7a3e8e36c50e1a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 13:50:40 +0000 Subject: [PATCH 133/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 157d361..02d960c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,10 +90,18 @@ daily-testing: environment: name: staging + image: + name: opensourcemano/tests:testing-daily + entrypoint: ["/robot-systest/run_test.sh", "-c", "T", "$TESTS_VERSION", "-t", "nothing"] + artifacts: when: always paths: - - artifacts + #- artifacts + - conformance-tests/reports + + before_script: + - echo "Before script" script: - echo "Running the test..." -- GitLab From 7c250899bae75c9a23c2d1f61a10e499e8e8043b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 13:53:50 +0000 Subject: [PATCH 134/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02d960c..6f72c78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ stages: build: stage: build - #when: manual + when: manual tags: - openstack environment: -- GitLab From 254b3cc05d80b5bdc4d737759f1ab1eccec30bf6 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 13:57:09 +0000 Subject: [PATCH 135/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f72c78..a89699d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,8 +102,12 @@ daily-testing: before_script: - echo "Before script" + - ls + - echo "GitLab Runner Installation" + - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash + - sudo apt-get install gitlab-runner script: - echo "Running the test..." - ls - - env + -- GitLab From f06cb5877555295b0fd72430d28fda5f1cd45e13 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 13:58:27 +0000 Subject: [PATCH 136/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a89699d..05940a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -92,7 +92,7 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - entrypoint: ["/robot-systest/run_test.sh", "-c", "T", "$TESTS_VERSION", "-t", "nothing"] + entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: when: always -- GitLab From a80ee74f7509f6b30040107dee80736ece111a85 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:01:34 +0000 Subject: [PATCH 137/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05940a6..3484c29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,8 +85,6 @@ build: daily-testing: stage: test - tags: - - openstack environment: name: staging -- GitLab From c32092bdb9362430813e07e9d799501f36918075 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:07:48 +0000 Subject: [PATCH 138/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3484c29..65f7aa1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,8 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] + entrypoint: [""] + #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: when: always -- GitLab From 3c3d9001f8400131d97688b4ef5a7327d8b53240 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:09:32 +0000 Subject: [PATCH 139/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65f7aa1..94fb89d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,9 +102,6 @@ daily-testing: before_script: - echo "Before script" - ls - - echo "GitLab Runner Installation" - - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - - sudo apt-get install gitlab-runner script: - echo "Running the test..." -- GitLab From 0dbafe8ac67a7398ab85845dff7cd92049f4318d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:13:03 +0000 Subject: [PATCH 140/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94fb89d..fd1243e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - entrypoint: [""] + #entrypoint: ["/bin/bash" "-c"] #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: @@ -101,6 +101,7 @@ daily-testing: before_script: - echo "Before script" + - mkdir conformance-tests/reports - ls script: -- GitLab From 416986dd3edc831e5ad0d065b5d96e02ae4f6937 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:17:42 +0000 Subject: [PATCH 141/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd1243e..1ca1fa1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - #entrypoint: ["/bin/bash" "-c"] + entrypoint: ["/bin/bash"] #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: -- GitLab From 21886f0a3064045c54f95dd43338ab8da4f748cd Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:18:33 +0000 Subject: [PATCH 142/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ca1fa1..9dbb75c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - entrypoint: ["/bin/bash"] + entrypoint: ["-it", "/bin/bash"] #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: -- GitLab From eba60a8fd925c19c2124aeab5cbc80610281aded Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:20:57 +0000 Subject: [PATCH 143/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dbb75c..c94a526 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - entrypoint: ["-it", "/bin/bash"] + entrypoint: ["/bin/sh", "-c"] #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: -- GitLab From 4f306a8b774f2cc97c42989c5d96fe8f75a49289 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:21:27 +0000 Subject: [PATCH 144/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c94a526..3676d60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - entrypoint: ["/bin/sh", "-c"] + entrypoint: ["/bin/sh"] #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: -- GitLab From af916fbdf69c23545da206ceb075d9582a7a48de Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:22:27 +0000 Subject: [PATCH 145/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3676d60..1ca1fa1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ daily-testing: image: name: opensourcemano/tests:testing-daily - entrypoint: ["/bin/sh"] + entrypoint: ["/bin/bash"] #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] artifacts: -- GitLab From b44c9479eeaf576cd18adc3ef32d5ab37483e648 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:50:27 +0000 Subject: [PATCH 146/235] Update .gitlab-ci.yml, scripts/conformance.sh files --- .gitlab-ci.yml | 21 +++++----------- scripts/conformance.sh | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 scripts/conformance.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ca1fa1..0906be3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,28 +83,19 @@ build: microk8s.kubectl logs -n osm $pod $container --timestamps=true 2>&1 > artifacts/$logfile.log done + + daily-testing: stage: test environment: name: staging - image: - name: opensourcemano/tests:testing-daily - entrypoint: ["/bin/bash"] - #entrypoint: ["/robot-systest/run_test.sh", "-c", "-T", "$TESTS_VERSION", "-t", "nothing"] - artifacts: when: always paths: #- artifacts - - conformance-tests/reports - - before_script: - - echo "Before script" - - mkdir conformance-tests/reports - - ls - + - reports + script: - - echo "Running the test..." - - ls - + - echo $VAR1 + - echo $VAR2 diff --git a/scripts/conformance.sh b/scripts/conformance.sh new file mode 100644 index 0000000..f519604 --- /dev/null +++ b/scripts/conformance.sh @@ -0,0 +1,55 @@ +#!/bin/bash + +echo "Conformance Testing" + +echo "OSM Robot Testing" + +#Configuring ENV variables +source hive/openstack-etsi.rc +export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 +export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") +export PROMETHEUS_PORT=80 +export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs) + +#Creating envfile +echo "Creating envfile" + +cat << EOF >> robot-systest.cfg +VIM_TARGET=osm +VIM_MGMT_NET=osm-ext +ENVIRONMENTS_FOLDER=environments +PACKAGES_FOLDER=/robot-systest/osm-packages +OS_CLOUD=openstack +LC_ALL=C.UTF-8 +LANG=C.UTF-8 +EOF + +envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg +cat robot-systest.cfg + +#Creating clouds.yaml file +echo "Creating clouds.yaml file" +source /$(pwd)/hive/openstack-etsi.rc +cat << EOF > clouds.yaml +clouds: + openstack: + auth: + auth_url: $OS_AUTH_URL + project_name: $OS_PROJECT_NAME + username: $OS_USERNAME + password: $OS_PASSWORD + user_domain_name: $OS_USER_DOMAIN_NAME + project_domain_name: $OS_PROJECT_DOMAIN_ID +EOF +cat clouds.yaml + +#Creating Docker container +docker run --env OSM_HOSTNAME=$OSM_HOSTNAME \ +--env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME \ +--env PROMETHEUS_PORT=$PROMETHEUS_PORT \ +--env JUJU_PASSWORD=$JUJU_PASSWORD \ +--env-file robot-systest.cfg \ +-v /clouds.yaml:/etc/openstack/clouds.yaml \ +-v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ +-v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ +opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing -- GitLab From 7cc7fb2414f51b1cbf5cacf1de430be5877364c9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:51:25 +0000 Subject: [PATCH 147/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0906be3..07520e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,5 +97,5 @@ daily-testing: - reports script: - - echo $VAR1 - - echo $VAR2 + - echo "$VAR1" + - echo "$VAR2" -- GitLab From d362ee8a256ee8f27495013be20d85f85d9c60d8 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 14:52:36 +0000 Subject: [PATCH 148/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07520e8..77877f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,3 +99,4 @@ daily-testing: script: - echo "$VAR1" - echo "$VAR2" + - echo "$TEST" -- GitLab From a92d27cc8115622dc62cb5fb49f1880b1d46cb3b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:20:07 +0000 Subject: [PATCH 149/235] Update test.py, utils.py, deploy.py files --- deploy.py | 49 ++----------------------------------------------- test.py | 17 +++++++++++++++++ utils.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 47 deletions(-) create mode 100644 test.py create mode 100644 utils.py diff --git a/deploy.py b/deploy.py index e72826e..ba36cf2 100644 --- a/deploy.py +++ b/deploy.py @@ -4,59 +4,14 @@ import time import subprocess import sys +from utils import * + imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" flavorRef = "m1.xlarge" networkId = "21ea5d92-24f1-40ab-8d28-83230e277a49" vmName = "VM-Test" keyName = "SSH" -def cleanVM(): - instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] - #TODO: Test 404 - res = computeRequest("DELETE", "servers/{}".format(instanceId), None) - print(res.status_code) - print(res.text) - - -def getAuth(): - #Source clouds.yaml/openstack.rc file first - url = "{}/auth/tokens?nocatalog".format(os.environ.get('OS_AUTH_URL')) - header = {"Content-Type": "application/json"} - payload = '{ "auth": { "identity": { "methods": ["password"],"password": {"user": {"domain": {"name": "%s"},"name": "%s", "password": "%s"} } }, "scope": { "project": { "domain": { "name": "%s"}, "name": "%s"} } }}' % (os.environ.get("OS_USER_DOMAIN_NAME"), os.environ.get("OS_USERNAME"), os.environ.get("OS_PASSWORD"), os.environ.get("OS_PROJECT_DOMAIN_ID"), os.environ.get("OS_PROJECT_NAME")) - res = requests.post(url, headers=header, data=payload) - print(res.status_code) - - if res.status_code == 201: - print("Yay") - token = res.headers['X-Subject-Token'] - # print(token) - os.environ["OS_TOKEN"] = token - print(os.environ.get('OS_TOKEN')) - else: - print("Nay") - -def computeRequest(method, endpoint, payload): - url = os.environ.get('OS_COMPUTE_API') - header = {"Content-Type": "application/json", "X-Auth-Token": os.environ.get('OS_TOKEN')} - print("{} : {}/{}".format(method, url, endpoint)) - res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) - return res - -def gitlabRequest(method, endpoint, payload): - url = os.environ.get('GITLAB_API') - header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} - if method == 'POST': - header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} - filter = '' - else: - header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} - filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) - print("{} : {}/{}".format(method, url, endpoint)) - #print(filter) - res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) - return res - - #Requesting openstack auth token getAuth() diff --git a/test.py b/test.py new file mode 100644 index 0000000..89458f0 --- /dev/null +++ b/test.py @@ -0,0 +1,17 @@ +import requests +import os +import time +import subprocess +import sys + + +#Retrieving instance ip +res = computeRequest("GET", "servers/{}".format(id), None) +ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] +print(ip) + +#Adding ECDSA key to known hosts +subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + +#Connecting via SSH & testing +subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/test.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/utils.py b/utils.py new file mode 100644 index 0000000..0b107dc --- /dev/null +++ b/utils.py @@ -0,0 +1,51 @@ +import requests +import os +import time +import subprocess +import sys + +def cleanVM(): + instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] + #TODO: Test 404 + res = computeRequest("DELETE", "servers/{}".format(instanceId), None) + print(res.status_code) + print(res.text) + + +def getAuth(): + #Source clouds.yaml/openstack.rc file first + url = "{}/auth/tokens?nocatalog".format(os.environ.get('OS_AUTH_URL')) + header = {"Content-Type": "application/json"} + payload = '{ "auth": { "identity": { "methods": ["password"],"password": {"user": {"domain": {"name": "%s"},"name": "%s", "password": "%s"} } }, "scope": { "project": { "domain": { "name": "%s"}, "name": "%s"} } }}' % (os.environ.get("OS_USER_DOMAIN_NAME"), os.environ.get("OS_USERNAME"), os.environ.get("OS_PASSWORD"), os.environ.get("OS_PROJECT_DOMAIN_ID"), os.environ.get("OS_PROJECT_NAME")) + res = requests.post(url, headers=header, data=payload) + print(res.status_code) + + if res.status_code == 201: + print("Yay") + token = res.headers['X-Subject-Token'] + # print(token) + os.environ["OS_TOKEN"] = token + print(os.environ.get('OS_TOKEN')) + else: + print("Nay") + +def computeRequest(method, endpoint, payload): + url = os.environ.get('OS_COMPUTE_API') + header = {"Content-Type": "application/json", "X-Auth-Token": os.environ.get('OS_TOKEN')} + print("{} : {}/{}".format(method, url, endpoint)) + res = requests.request("{}".format(method), "{}/{}".format(url, endpoint), headers=header, data=payload) + return res + +def gitlabRequest(method, endpoint, payload): + url = os.environ.get('GITLAB_API') + header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + if method == 'POST': + header = {"Content-Type": "application/json", "Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + filter = '' + else: + header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} + filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) + print("{} : {}/{}".format(method, url, endpoint)) + #print(filter) + res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) + return res -- GitLab From 7631c69429f157d44856f2ee1a93cefac73c9f2f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:21:01 +0000 Subject: [PATCH 150/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77877f5..a8ddeaa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,6 +97,5 @@ daily-testing: - reports script: - - echo "$VAR1" - - echo "$VAR2" - - echo "$TEST" + - python3 conformance.py + -- GitLab From a9fa128dbdb28f90a589894456ccbc1dbe4a818b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:21:54 +0000 Subject: [PATCH 151/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8ddeaa..1baee1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,6 +89,8 @@ daily-testing: stage: test environment: name: staging + tags: + - openstack artifacts: when: always -- GitLab From 2a85321a4eb5769aea39c09e2958a877cb8aaa6f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:23:20 +0000 Subject: [PATCH 152/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1baee1f..7ee8ae3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,5 +99,5 @@ daily-testing: - reports script: - - python3 conformance.py + - python3 test.py -- GitLab From 2d65164f0a8edde88d9a18a92a95e377efccad97 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:24:49 +0000 Subject: [PATCH 153/235] Update test.py --- test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test.py b/test.py index 89458f0..8d8dc7a 100644 --- a/test.py +++ b/test.py @@ -3,6 +3,7 @@ import os import time import subprocess import sys +from utils import * #Retrieving instance ip -- GitLab From 50aa6f0b2df5c866613f952c2a0085ab8a07297e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:27:01 +0000 Subject: [PATCH 154/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ee8ae3..e4d6cc8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,5 +99,7 @@ daily-testing: - reports script: + - set -a + - source hive/openstack-etsi.rc - python3 test.py -- GitLab From 1faf7207501cae0ec04626cf22e73ef24833333a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:30:28 +0000 Subject: [PATCH 155/235] Update test.py --- test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test.py b/test.py index 8d8dc7a..0752fc2 100644 --- a/test.py +++ b/test.py @@ -6,6 +6,9 @@ import sys from utils import * +#Retrieving instance id +id = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] + #Retrieving instance ip res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] -- GitLab From 66fe0ae724aef7ee0b2395a284dab6078bc8a085 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:36:35 +0000 Subject: [PATCH 156/235] Update test.py, deploy.py files --- deploy.py | 1 - test.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy.py b/deploy.py index ba36cf2..f829f70 100644 --- a/deploy.py +++ b/deploy.py @@ -16,7 +16,6 @@ keyName = "SSH" #Requesting openstack auth token getAuth() - #Deleting previous instance cleanVM() diff --git a/test.py b/test.py index 0752fc2..fddb00b 100644 --- a/test.py +++ b/test.py @@ -6,8 +6,12 @@ import sys from utils import * +#Requesting openstack auth token +getAuth() + #Retrieving instance id id = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] +print(id) #Retrieving instance ip res = computeRequest("GET", "servers/{}".format(id), None) -- GitLab From 9d6153debb8e0fbb8577f6af32e4165d2eeb3742 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 15:41:06 +0000 Subject: [PATCH 157/235] Update .gitlab-ci.yml, test.py files --- .gitlab-ci.yml | 5 +++++ test.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e4d6cc8..2c30c76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,6 +97,11 @@ daily-testing: paths: #- artifacts - reports + + before_script: + - echo "GitLab Runner Installation" + - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash + - sudo apt-get install gitlab-runner script: - set -a diff --git a/test.py b/test.py index fddb00b..2e58813 100644 --- a/test.py +++ b/test.py @@ -22,4 +22,4 @@ print(ip) subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & testing -subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/test.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From 22bfc493453555d6abec90fbae320d62a8bc3ed2 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 16:21:52 +0000 Subject: [PATCH 158/235] Update test.py, .gitlab-ci.yml, scripts/conformance.sh files --- .gitlab-ci.yml | 1 + scripts/conformance.sh | 2 +- test.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c30c76..abdbbf8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,4 +107,5 @@ daily-testing: - set -a - source hive/openstack-etsi.rc - python3 test.py + - echo "tests finished" diff --git a/scripts/conformance.sh b/scripts/conformance.sh index f519604..5485ba8 100644 --- a/scripts/conformance.sh +++ b/scripts/conformance.sh @@ -5,7 +5,7 @@ echo "Conformance Testing" echo "OSM Robot Testing" #Configuring ENV variables -source hive/openstack-etsi.rc +source /$(pwd)/hive/openstack-etsi.rc export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") export PROMETHEUS_PORT=80 diff --git a/test.py b/test.py index 2e58813..cf52aa1 100644 --- a/test.py +++ b/test.py @@ -22,4 +22,4 @@ print(ip) subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & testing -subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From 9e465f77f2162388c4cab4c36dc76edf7319faf9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 3 Jan 2022 16:25:07 +0000 Subject: [PATCH 159/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abdbbf8..f73ebf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,7 +95,7 @@ daily-testing: artifacts: when: always paths: - #- artifacts + - artifacts - reports before_script: -- GitLab From 8a121bf477e7efc61d660190fa042f85e3d3ea5e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 13:50:13 +0000 Subject: [PATCH 160/235] Update .gitlab-ci.yml, scripts/deploy.sh files --- .gitlab-ci.yml | 11 ++--------- scripts/deploy.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f73ebf0..c120233 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,7 @@ build: + daily-testing: stage: test environment: @@ -98,14 +99,6 @@ daily-testing: - artifacts - reports - before_script: - - echo "GitLab Runner Installation" - - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - - sudo apt-get install gitlab-runner - script: - - set -a - - source hive/openstack-etsi.rc - - python3 test.py - - echo "tests finished" + - echo $OSM_HOSTNAME diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 5d63a98..064c2c6 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -36,3 +36,49 @@ sudo systemctl restart snap.microk8s.daemon-containerd.service sudo snap alias microk8s.kubectl kubectl ./install_osm.sh -y --charmed -t 10.0.3 2>&1 | tee artifacts/install_osm.log rm install_osm.sh + +#Configuring ENV variables + +#TODO scp config file +source /$(pwd)/hive/openstack-etsi.rc +export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 +export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") +export PROMETHEUS_PORT=80 +export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs) + +#TODO add to bashrc + + +#Creating envfile +echo "Creating envfile" + +cat << EOF >> robot-systest.cfg +VIM_TARGET=osm +VIM_MGMT_NET=osm-ext +ENVIRONMENTS_FOLDER=environments +PACKAGES_FOLDER=/robot-systest/osm-packages +OS_CLOUD=openstack +LC_ALL=C.UTF-8 +LANG=C.UTF-8 +EOF + +envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg +cat robot-systest.cfg + +#Creating clouds.yaml file +echo "Creating clouds.yaml file" +source /$(pwd)/hive/openstack-etsi.rc +cat << EOF > clouds.yaml +clouds: + openstack: + auth: + auth_url: $OS_AUTH_URL + project_name: $OS_PROJECT_NAME + username: $OS_USERNAME + password: $OS_PASSWORD + user_domain_name: $OS_USER_DOMAIN_NAME + project_domain_name: $OS_PROJECT_DOMAIN_ID +EOF +cat clouds.yaml + + -- GitLab From 87b54eb460b4d67b8094657ad71861c26e4320da Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 15:11:27 +0000 Subject: [PATCH 161/235] Update .gitlab-ci.yml, scripts/deploy.sh files --- .gitlab-ci.yml | 9 +++------ scripts/deploy.sh | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c120233..fb59e34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,14 +84,13 @@ build: done - - daily-testing: stage: test environment: name: staging - tags: - - openstack + + image: + name: "opensourcemano/tests:testing-daily" artifacts: when: always @@ -99,6 +98,4 @@ daily-testing: - artifacts - reports - script: - - echo $OSM_HOSTNAME diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 064c2c6..898b162 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -47,6 +47,7 @@ export PROMETHEUS_PORT=80 export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs) #TODO add to bashrc +echo 'export OSM_HOSTNAME=${OSM_HOSTNAME}' >> ~/.bashrc #Creating envfile @@ -81,4 +82,9 @@ clouds: EOF cat clouds.yaml +#Creating a VIM +osm vim-create --name ${VIM_TARGET} --user ${OS_USERNAME} --password ${OS_PASSWORD} --tenant ${OS_PROJECT_NAME} \ +--auth_url ${OS_AUTH_URL} --account_type openstack --description vim \ +--config "{management_network_name: ${VIM_MGMT_NET}, dataplane_physical_net: ${DATAPLANE:-physnet2}}" || true + -- GitLab From e4b15b10bd6587c0a55b8a6ecb9bc4df06965082 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 15:12:22 +0000 Subject: [PATCH 162/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb59e34..dd6d2c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,5 +97,7 @@ daily-testing: paths: - artifacts - reports + script: + - echo "Testing..." -- GitLab From db6e6bb7b08586d53d8c033eb18ebc7b633b1b0e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 15:14:11 +0000 Subject: [PATCH 163/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd6d2c6..8994397 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,7 +97,7 @@ daily-testing: paths: - artifacts - reports - script: - - echo "Testing..." + script: + - echo "Testing..." -- GitLab From c106dd9d9dc2ffc57c620d3d7b133e1fa959c793 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 15:19:40 +0000 Subject: [PATCH 164/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8994397..b752f91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,9 +88,8 @@ daily-testing: stage: test environment: name: staging - - image: - name: "opensourcemano/tests:testing-daily" + tags: + - openstack artifacts: when: always @@ -98,6 +97,26 @@ daily-testing: - artifacts - reports script: - - echo "Testing..." + #Creating envfile + - echo "Creating envfile" + - | + cat << EOF >> robot-systest.cfg + VIM_TARGET=osm + VIM_MGMT_NET=osm-ext + ENVIRONMENTS_FOLDER=environments + PACKAGES_FOLDER=/robot-systest/osm-packages + OS_CLOUD=openstack + LC_ALL=C.UTF-8 + LANG=C.UTF-8 + EOF + + - envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg + - cat robot-systest.cfg + + - | + docker run --env OSM_HOSTNAME=nbi.172.21.248.89.nip.io:443 + --env JUJU_PASSWORD=$JUJU_PASSWORD + --env-file robot-systest.cfg + opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing -- GitLab From 2ece13732af7b5370c16279ae1463ae74a9e06ec Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 15:25:55 +0000 Subject: [PATCH 165/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b752f91..9aa6800 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,8 +88,10 @@ daily-testing: stage: test environment: name: staging - tags: - - openstack + image: + name: "opensourcemano/tests:testing-daily" + entrypoint: ["/robot-systest/run_test.sh", "-T", "2.7.1", "-t", "nothing"] + artifacts: when: always @@ -97,26 +99,7 @@ daily-testing: - artifacts - reports script: - #Creating envfile - - echo "Creating envfile" - - | - cat << EOF >> robot-systest.cfg - VIM_TARGET=osm - VIM_MGMT_NET=osm-ext - ENVIRONMENTS_FOLDER=environments - PACKAGES_FOLDER=/robot-systest/osm-packages - OS_CLOUD=openstack - LC_ALL=C.UTF-8 - LANG=C.UTF-8 - EOF - - - envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg - - cat robot-systest.cfg - - | - docker run --env OSM_HOSTNAME=nbi.172.21.248.89.nip.io:443 - --env JUJU_PASSWORD=$JUJU_PASSWORD - --env-file robot-systest.cfg - opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing + - echo "Testing..." -- GitLab From 8b5b682866bd7385eea87339ff59c130d32f9d94 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 21:03:25 +0000 Subject: [PATCH 166/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9aa6800..bba32c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,10 +84,14 @@ build: done + + daily-testing: stage: test environment: name: staging + tags: + - openstack image: name: "opensourcemano/tests:testing-daily" entrypoint: ["/robot-systest/run_test.sh", "-T", "2.7.1", "-t", "nothing"] @@ -100,6 +104,6 @@ daily-testing: - reports script: - - echo "Testing..." + - env -- GitLab From 7144230ce415c9324f2dee5933e08f94576e12d0 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 21:12:44 +0000 Subject: [PATCH 167/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bba32c2..d6e41c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,6 +83,26 @@ build: microk8s.kubectl logs -n osm $pod $container --timestamps=true 2>&1 > artifacts/$logfile.log done +testing: + stage: test + environment: + name: staging + tags: + - openstack + artifacts: + when: always + paths: + - artifacts + - reports + script: + - echo "Test..." + - | + docker run --env OSM_HOSTNAME=$OSM_HOSTNAME \ + --env JUJU_PASSWORD=$JUJU_PASSWORD \ + -v /clouds.yaml:/etc/openstack/clouds.yaml \ + -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ + -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ + opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing @@ -104,6 +124,6 @@ daily-testing: - reports script: - - env + - echo "" -- GitLab From 425fa337c4691aafbf41acceb8e08af8fb67d90d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 21:17:48 +0000 Subject: [PATCH 168/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d6e41c7..8566404 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,6 +96,23 @@ testing: - reports script: - echo "Test..." + - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg + - | + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + - sudo apt-get update + - sudo apt-get install docker-ce docker-ce-cli containerd.io -y + - | + cat << EOF | sudo tee /etc/docker/daemon.json + { + "registry-mirrors": ["http://172.21.1.1:5000"] + } + EOF + - sudo chmod 666 /var/run/docker.sock + - sudo systemctl daemon-reload + - sudo systemctl restart docker.service + - | docker run --env OSM_HOSTNAME=$OSM_HOSTNAME \ --env JUJU_PASSWORD=$JUJU_PASSWORD \ -- GitLab From 454775da77e265646430f6eed87242b1a43bc5f4 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 4 Jan 2022 21:28:48 +0000 Subject: [PATCH 169/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8566404..d10cfcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,9 +93,13 @@ testing: when: always paths: - artifacts - - reports script: - echo "Test..." + + - echo "GitLab Runner Installation" + - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash + - sudo apt-get install gitlab-runner + - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - | echo \ @@ -112,11 +116,12 @@ testing: - sudo chmod 666 /var/run/docker.sock - sudo systemctl daemon-reload - sudo systemctl restart docker.service - + + - echo "TST10" + - | docker run --env OSM_HOSTNAME=$OSM_HOSTNAME \ --env JUJU_PASSWORD=$JUJU_PASSWORD \ - -v /clouds.yaml:/etc/openstack/clouds.yaml \ -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing -- GitLab From 01374c38445b8ab7af0623a52378978be0496ca8 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 5 Jan 2022 09:28:22 +0000 Subject: [PATCH 170/235] Update .gitlab-ci.yml, deploy.py files --- .gitlab-ci.yml | 22 ---------------------- deploy.py | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d10cfcb..1b88d37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,25 +127,3 @@ testing: opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing - -daily-testing: - stage: test - environment: - name: staging - tags: - - openstack - image: - name: "opensourcemano/tests:testing-daily" - entrypoint: ["/robot-systest/run_test.sh", "-T", "2.7.1", "-t", "nothing"] - - - artifacts: - when: always - paths: - - artifacts - - reports - script: - - - echo "" - - diff --git a/deploy.py b/deploy.py index f829f70..9ea5e86 100644 --- a/deploy.py +++ b/deploy.py @@ -52,6 +52,22 @@ res = computeRequest("GET", "servers/{}".format(id), None) ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] print(ip) +#Storing OSM Hostname in GitLab +hostname = "nbi.{}.nip.io:443".format(ip) +if (gitlabRequest('GET', 'variables/OSM_HOSTNAME', None).status_code == 404): + #POST + payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "%s","protected": false,"masked": false,"environment_scope": "%s"}' % (id, os.environ.get('CI_ENVIRONMENT_NAME')) + res = gitlabRequest("POST", "variables", payload) + print(res.text) +else: + #PUT + res = gitlabRequest('PUT', 'variables/INSTANCE_ID', {"value": "{}".format(id)}) + print(res.status_code) + print(res.text) + +print(res.status_code) +print(res.text) + #Adding ECDSA key to known hosts subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From c4b0cbcc2964237af8869d0f11f1422005369bfd Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 5 Jan 2022 09:48:27 +0000 Subject: [PATCH 171/235] Update deploy.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 1 + deploy.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b88d37..d4c0126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,7 @@ build: testing: stage: test + when: manual environment: name: staging tags: diff --git a/deploy.py b/deploy.py index 9ea5e86..b51d5ea 100644 --- a/deploy.py +++ b/deploy.py @@ -56,12 +56,12 @@ print(ip) hostname = "nbi.{}.nip.io:443".format(ip) if (gitlabRequest('GET', 'variables/OSM_HOSTNAME', None).status_code == 404): #POST - payload = '{"variable_type": "env_var","key": "INSTANCE_ID","value": "%s","protected": false,"masked": false,"environment_scope": "%s"}' % (id, os.environ.get('CI_ENVIRONMENT_NAME')) + payload = '{"variable_type": "env_var","key": "OSM_HOSTNAME","value": "%s","protected": false,"masked": false,"environment_scope": "%s"}' % (id, os.environ.get('CI_ENVIRONMENT_NAME')) res = gitlabRequest("POST", "variables", payload) print(res.text) else: #PUT - res = gitlabRequest('PUT', 'variables/INSTANCE_ID', {"value": "{}".format(id)}) + res = gitlabRequest('PUT', 'variables/OSM_HOSTNAME', {"value": "{}".format(hostname)}) print(res.status_code) print(res.text) -- GitLab From bc70556a5b97fccd332b4278aade415b84fa4750 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 5 Jan 2022 10:34:26 +0000 Subject: [PATCH 172/235] Update scripts/deploy.sh --- scripts/deploy.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 898b162..0af7a07 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -2,8 +2,8 @@ echo "Installing" -mkdir artifacts -mkdir reports +#mkdir artifacts +#mkdir reports sudo apt-get update sudo apt-get install -y \ ca-certificates \ @@ -40,6 +40,7 @@ rm install_osm.sh #Configuring ENV variables #TODO scp config file +set -a source /$(pwd)/hive/openstack-etsi.rc export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") @@ -47,7 +48,7 @@ export PROMETHEUS_PORT=80 export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs) #TODO add to bashrc -echo 'export OSM_HOSTNAME=${OSM_HOSTNAME}' >> ~/.bashrc +echo 'export OSM_HOSTNAME='$OSM_HOSTNAME >> ~/.bashrc #Creating envfile -- GitLab From 6b67882dcf095c42ce195158d1db62a0453d4977 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 5 Jan 2022 13:13:10 +0000 Subject: [PATCH 173/235] Update deploy.py, scripts/deploy.sh, .gitlab-ci.yml files --- .gitlab-ci.yml | 2 ++ deploy.py | 3 +++ scripts/deploy.sh | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4c0126..2c3e709 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,6 +62,8 @@ build: script: - set -a - source hive/openstack-etsi.rc + #- envsubst < $(pwd)/hive/openstack-etsi.rc >> $(pwd)/hive/robot-systest.cfg + - cat $(pwd)/hive/openstack-etsi.rc | envsubst > $(pwd)/hive/openstack-etsi.rc - echo $OS_PASSWORD - ls diff --git a/deploy.py b/deploy.py index b51d5ea..774e29c 100644 --- a/deploy.py +++ b/deploy.py @@ -74,6 +74,9 @@ subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], she #Copying scripts to deployment server subprocess.run(["scp -r scripts/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#Copying config files to deployment server +subprocess.run(["scp -r hive/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + #Connecting via SSH & installing OSM subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 0af7a07..a391720 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -41,7 +41,7 @@ rm install_osm.sh #TODO scp config file set -a -source /$(pwd)/hive/openstack-etsi.rc +source ~/hive/openstack-etsi.rc export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") export PROMETHEUS_PORT=80 @@ -64,12 +64,12 @@ LC_ALL=C.UTF-8 LANG=C.UTF-8 EOF -envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg +envsubst < ~/hive/openstack-etsi.rc >> robot-systest.cfg cat robot-systest.cfg #Creating clouds.yaml file echo "Creating clouds.yaml file" -source /$(pwd)/hive/openstack-etsi.rc +source ~/hive/openstack-etsi.rc cat << EOF > clouds.yaml clouds: openstack: -- GitLab From 14be7ff40d7fb26564e4a8b784280cb914563eab Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 5 Jan 2022 13:33:40 +0000 Subject: [PATCH 174/235] Update scripts/deploy.sh --- scripts/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index a391720..ec819f4 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -66,6 +66,7 @@ EOF envsubst < ~/hive/openstack-etsi.rc >> robot-systest.cfg cat robot-systest.cfg +source robot-systest.cfg #Creating clouds.yaml file echo "Creating clouds.yaml file" -- GitLab From e6e89bf6ba28af3f94d87894d80b218766518da6 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 5 Jan 2022 14:20:28 +0000 Subject: [PATCH 175/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c3e709..b1e4e28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,7 @@ testing: stage: test when: manual environment: - name: staging + name: test tags: - openstack artifacts: -- GitLab From 7483749495fda3566b1ac5113e7793e7eeb0e098 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 09:44:50 +0000 Subject: [PATCH 176/235] Update utils.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 24 +++++++++++++++++++++--- utils.py | 5 ++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1e4e28..7ba99cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,12 +18,14 @@ variables: SSH_KEY: $SSH_KEY GITLAB_API: $GITLAB_API GITLAB_TOKEN: $GITLAB_TOKEN - #HIVE_PATH: "~/builds/gitlab/devops/cicd/hive" + ENV: "staging" + PIPELINE: "TEST" stages: - build - test - deploy + - cleanup build: @@ -32,9 +34,12 @@ build: tags: - openstack environment: - name: staging + name: $ENV action: prepare + rules: + - if: $PIPELINE == "DEPLOY" + artifacts: when: always paths: @@ -89,9 +94,11 @@ testing: stage: test when: manual environment: - name: test + name: $ENV tags: - openstack + rules: + - if: $PIPELINE == "TEST" artifacts: when: always paths: @@ -130,3 +137,14 @@ testing: opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing + cleanup: + stage: cleanup + when: manual + environment: + name: $ENV + tags: + - openstack + rules: + - if: $PIPELINE == "CLEANUP" + script: + - python3 -c 'from utils import *; print cleanVM()' diff --git a/utils.py b/utils.py index 0b107dc..3ac3268 100644 --- a/utils.py +++ b/utils.py @@ -5,6 +5,10 @@ import subprocess import sys def cleanVM(): + + if (os.environ.get('OS_TOKEN') == ''): + getAuth() + instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] #TODO: Test 404 res = computeRequest("DELETE", "servers/{}".format(instanceId), None) @@ -23,7 +27,6 @@ def getAuth(): if res.status_code == 201: print("Yay") token = res.headers['X-Subject-Token'] - # print(token) os.environ["OS_TOKEN"] = token print(os.environ.get('OS_TOKEN')) else: -- GitLab From 954798d5126164f0b0359f4d92944341388d42e7 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 09:52:14 +0000 Subject: [PATCH 177/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ba99cf..e6f2d1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,6 @@ stages: build: stage: build - when: manual tags: - openstack environment: @@ -92,7 +91,6 @@ build: testing: stage: test - when: manual environment: name: $ENV tags: @@ -136,15 +134,15 @@ testing: -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing - - cleanup: +cleanup: stage: cleanup when: manual environment: - name: $ENV + name: $ENV tags: - - openstack + - openstack rules: - - if: $PIPELINE == "CLEANUP" + - if: $PIPELINE == "CLEANUP" script: - python3 -c 'from utils import *; print cleanVM()' + -- GitLab From 6f1b7bad65df7bacc534335493d054cf824578d5 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 09:52:36 +0000 Subject: [PATCH 178/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6f2d1a..9ab85ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,6 @@ testing: cleanup: stage: cleanup - when: manual environment: name: $ENV tags: -- GitLab From b2d16afa4c0f0018d264351f1106a3f21958e0cf Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 10:23:22 +0000 Subject: [PATCH 179/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ab85ca..be00c8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,6 +95,7 @@ testing: name: $ENV tags: - openstack + resource_group: $ENV rules: - if: $PIPELINE == "TEST" artifacts: -- GitLab From cc42f91bed23740515d931d371c4f65c09561762 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 10:35:17 +0000 Subject: [PATCH 180/235] Update .gitlab-ci.yml, utils.py files --- .gitlab-ci.yml | 2 ++ utils.py | 1 + 2 files changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be00c8a..460b9a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,5 +144,7 @@ cleanup: rules: - if: $PIPELINE == "CLEANUP" script: + - set -a + - source hive/openstack-etsi.rc - python3 -c 'from utils import *; print cleanVM()' diff --git a/utils.py b/utils.py index 3ac3268..c84e098 100644 --- a/utils.py +++ b/utils.py @@ -10,6 +10,7 @@ def cleanVM(): getAuth() instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] + print(instanceId.text) #TODO: Test 404 res = computeRequest("DELETE", "servers/{}".format(instanceId), None) print(res.status_code) -- GitLab From d95244425f175e9540511cf1a29ce730472ebdb9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 10:45:28 +0000 Subject: [PATCH 181/235] Update utils.py --- utils.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/utils.py b/utils.py index c84e098..a63e779 100644 --- a/utils.py +++ b/utils.py @@ -9,12 +9,16 @@ def cleanVM(): if (os.environ.get('OS_TOKEN') == ''): getAuth() - instanceId = (gitlabRequest("GET", "variables/INSTANCE_ID", None).json())['value'] - print(instanceId.text) - #TODO: Test 404 - res = computeRequest("DELETE", "servers/{}".format(instanceId), None) - print(res.status_code) - print(res.text) + res = gitlabRequest("GET", "variables/INSTANCE_ID", None) + if res.status_code != 404: + instanceId = res.json())['value'] + print(instanceId.text) + #TODO: Test 404 + res = computeRequest("DELETE", "servers/{}".format(instanceId), None) + print(res.status_code) + print(res.text) + else: + print("No cleaning to do!") def getAuth(): -- GitLab From 44dfa47cd5da04291d2a184b6b1358fa563fd8ac Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 10:50:04 +0000 Subject: [PATCH 182/235] Update utils.py --- utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils.py b/utils.py index a63e779..639e90a 100644 --- a/utils.py +++ b/utils.py @@ -10,10 +10,9 @@ def cleanVM(): getAuth() res = gitlabRequest("GET", "variables/INSTANCE_ID", None) - if res.status_code != 404: - instanceId = res.json())['value'] + if res.status_code == 200: + instanceId = res.json()['value'] print(instanceId.text) - #TODO: Test 404 res = computeRequest("DELETE", "servers/{}".format(instanceId), None) print(res.status_code) print(res.text) -- GitLab From c2a09369a1f514dac161d254fd98b7464dc59954 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 11:12:14 +0000 Subject: [PATCH 183/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 460b9a0..3e4839f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,6 @@ build: - openstack environment: name: $ENV - action: prepare rules: - if: $PIPELINE == "DEPLOY" -- GitLab From 782f9e9a62d38711bef88d7d5f70c83c308933ed Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 11:13:10 +0000 Subject: [PATCH 184/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e4839f..d76ea2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,7 @@ build: - openstack environment: name: $ENV + resource_group: $ENV rules: - if: $PIPELINE == "DEPLOY" @@ -138,6 +139,7 @@ cleanup: stage: cleanup environment: name: $ENV + resource_group: $ENV tags: - openstack rules: -- GitLab From 75561c38b6b048b88155459b56b0d9dca9c1a5cf Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 11:20:05 +0000 Subject: [PATCH 185/235] Update utils.py --- utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/utils.py b/utils.py index 639e90a..4d2bb0e 100644 --- a/utils.py +++ b/utils.py @@ -12,7 +12,6 @@ def cleanVM(): res = gitlabRequest("GET", "variables/INSTANCE_ID", None) if res.status_code == 200: instanceId = res.json()['value'] - print(instanceId.text) res = computeRequest("DELETE", "servers/{}".format(instanceId), None) print(res.status_code) print(res.text) -- GitLab From d1dba00952d89c24e0ec9c4aeae9602bf548c698 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 12:17:09 +0000 Subject: [PATCH 186/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d76ea2b..949328b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,5 +147,5 @@ cleanup: script: - set -a - source hive/openstack-etsi.rc - - python3 -c 'from utils import *; print cleanVM()' + - python3 -c 'from utils import *; cleanVM()' -- GitLab From 552997ccd5079e419435fcf3c4cf63b6792d2e2a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 12:23:06 +0000 Subject: [PATCH 187/235] Update utils.py --- utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils.py b/utils.py index 4d2bb0e..ae67e80 100644 --- a/utils.py +++ b/utils.py @@ -7,7 +7,11 @@ import sys def cleanVM(): if (os.environ.get('OS_TOKEN') == ''): + print("Token") + print(os.environ.get('OS_TOKEN')) getAuth() + else: + print("No token") res = gitlabRequest("GET", "variables/INSTANCE_ID", None) if res.status_code == 200: -- GitLab From c0ba761ab135ab5adf705573b82021fba36f4197 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 12:28:19 +0000 Subject: [PATCH 188/235] Update utils.py --- utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.py b/utils.py index ae67e80..0a8489e 100644 --- a/utils.py +++ b/utils.py @@ -6,7 +6,7 @@ import sys def cleanVM(): - if (os.environ.get('OS_TOKEN') == ''): + if (os.environ.get('OS_TOKEN') is None): print("Token") print(os.environ.get('OS_TOKEN')) getAuth() -- GitLab From 35ac6a45d74e1e06d859343c96c24b59cf6b9397 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 13:51:13 +0000 Subject: [PATCH 189/235] Update utils.py, scripts/conformance.sh, .gitlab-ci.yml, test.py, deploy.py files --- .gitlab-ci.yml | 2 ++ deploy.py | 4 +++ scripts/conformance.sh | 65 ++++++++---------------------------------- test.py | 5 +++- utils.py | 18 +++++++++--- 5 files changed, 36 insertions(+), 58 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 949328b..d2eba2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,6 +134,8 @@ testing: -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing + + - python3 test.py cleanup: stage: cleanup diff --git a/deploy.py b/deploy.py index 774e29c..748dfc2 100644 --- a/deploy.py +++ b/deploy.py @@ -80,3 +80,7 @@ subprocess.run(["scp -r hive/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subp #Connecting via SSH & installing OSM subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#Copying back the logs +subprocess.run(["scp ubuntu@{} 'scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + diff --git a/scripts/conformance.sh b/scripts/conformance.sh index 5485ba8..c0bb788 100644 --- a/scripts/conformance.sh +++ b/scripts/conformance.sh @@ -1,55 +1,14 @@ #!/bin/bash -echo "Conformance Testing" - -echo "OSM Robot Testing" - -#Configuring ENV variables -source /$(pwd)/hive/openstack-etsi.rc -export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 -export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") -export PROMETHEUS_PORT=80 -export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs) - -#Creating envfile -echo "Creating envfile" - -cat << EOF >> robot-systest.cfg -VIM_TARGET=osm -VIM_MGMT_NET=osm-ext -ENVIRONMENTS_FOLDER=environments -PACKAGES_FOLDER=/robot-systest/osm-packages -OS_CLOUD=openstack -LC_ALL=C.UTF-8 -LANG=C.UTF-8 -EOF - -envsubst < $(pwd)/hive/openstack-etsi.rc >> robot-systest.cfg -cat robot-systest.cfg - -#Creating clouds.yaml file -echo "Creating clouds.yaml file" -source /$(pwd)/hive/openstack-etsi.rc -cat << EOF > clouds.yaml -clouds: - openstack: - auth: - auth_url: $OS_AUTH_URL - project_name: $OS_PROJECT_NAME - username: $OS_USERNAME - password: $OS_PASSWORD - user_domain_name: $OS_USER_DOMAIN_NAME - project_domain_name: $OS_PROJECT_DOMAIN_ID -EOF -cat clouds.yaml - -#Creating Docker container -docker run --env OSM_HOSTNAME=$OSM_HOSTNAME \ ---env PROMETHEUS_HOSTNAME=$PROMETHEUS_HOSTNAME \ ---env PROMETHEUS_PORT=$PROMETHEUS_PORT \ ---env JUJU_PASSWORD=$JUJU_PASSWORD \ ---env-file robot-systest.cfg \ --v /clouds.yaml:/etc/openstack/clouds.yaml \ --v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ --v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ -opensourcemano/tests:testing-daily -c -T $TESTS_VERSION -t nothing +#Collecting logs +echo "Collecting Logs" +microk8s.kubectl get pods -n osm + +for pod in `microk8s.kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do + logfile=`echo $pod | cut -d- -f1` + echo "Extracting log for $logfile" + container="" + if [ $pod == "prometheus-0" ] ; then container="prometheus" ; fi + if [ $pod == "mongodb-k8s-0" ] ; then container="mongodb-k8s" ; fi + microk8s.kubectl logs -n osm $pod $container --timestamps=true 2>&1 > ~/artifacts/$logfile.log +done diff --git a/test.py b/test.py index cf52aa1..b6aa11a 100644 --- a/test.py +++ b/test.py @@ -22,4 +22,7 @@ print(ip) subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & testing -subprocess.run(["ssh ubuntu@{} 'scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} 'scripts/conformance.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + +#Copying back the logs +subprocess.run(["scp -r ubuntu@{}:~/artifacts/ ~/artifacts/logs".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/utils.py b/utils.py index 0a8489e..c811ad1 100644 --- a/utils.py +++ b/utils.py @@ -7,11 +7,7 @@ import sys def cleanVM(): if (os.environ.get('OS_TOKEN') is None): - print("Token") - print(os.environ.get('OS_TOKEN')) getAuth() - else: - print("No token") res = gitlabRequest("GET", "variables/INSTANCE_ID", None) if res.status_code == 200: @@ -59,3 +55,17 @@ def gitlabRequest(method, endpoint, payload): #print(filter) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res + +def getLogs(): + + if (os.environ.get('OS_TOKEN') is None): + getAuth() + + #Retrieving instance ip + res = computeRequest("GET", "servers/{}".format(id), None) + ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] + + subprocess.run(["scp ubuntu@{} 'scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + + -- GitLab From 4f902b01f26744638315eca2720392429d7ffef3 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 13:56:54 +0000 Subject: [PATCH 190/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2eba2b..502dc14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,19 +75,6 @@ build: - python3 deploy.py - ls - after_script: - - export PATH=/snap/bin:$PATH - - echo "Collecting Logs" - - microk8s.kubectl get pods -n osm - - | - for pod in `microk8s.kubectl get pods -n osm | grep -v operator | grep -v NAME| awk '{print $1}'`; do - logfile=`echo $pod | cut -d- -f1` - echo "Extracting log for $logfile" - container="" - if [ $pod == "prometheus-0" ] ; then container="prometheus" ; fi - if [ $pod == "mongodb-k8s-0" ] ; then container="mongodb-k8s" ; fi - microk8s.kubectl logs -n osm $pod $container --timestamps=true 2>&1 > artifacts/$logfile.log - done testing: stage: test @@ -134,7 +121,9 @@ testing: -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing - + + - set -a + - source hive/openstack-etsi.rc - python3 test.py cleanup: -- GitLab From 0b3956e26f597af7f5c82c5ceff3f61a1e50076d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 14:22:01 +0000 Subject: [PATCH 191/235] Update deploy.py, test.py files --- deploy.py | 3 +-- test.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deploy.py b/deploy.py index 748dfc2..f47e37a 100644 --- a/deploy.py +++ b/deploy.py @@ -80,7 +80,6 @@ subprocess.run(["scp -r hive/ ubuntu@{}:~/".format(ip)], shell=True, stdout=subp #Connecting via SSH & installing OSM subprocess.run(["ssh ubuntu@{} 'chmod +x scripts/*.sh && scripts/deploy.sh' > artifacts/SSH.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -#Copying back the logs -subprocess.run(["scp ubuntu@{} 'scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + diff --git a/test.py b/test.py index b6aa11a..0a28139 100644 --- a/test.py +++ b/test.py @@ -22,7 +22,7 @@ print(ip) subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & testing -subprocess.run(["ssh ubuntu@{} 'scripts/conformance.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} '~/scripts/conformance.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying back the logs subprocess.run(["scp -r ubuntu@{}:~/artifacts/ ~/artifacts/logs".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From a4756a7dbdee4025ba12088b0361b3046ded0940 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 14:24:32 +0000 Subject: [PATCH 192/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 502dc14..ba159f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,9 @@ testing: -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing - + + - echo -e "$SSH_KEY" > ~/.ssh/id_rsa + - chmod 600 ~/.ssh/id_rsa - set -a - source hive/openstack-etsi.rc - python3 test.py -- GitLab From d18b188cd6775dd4b3fcaf9c6fb419d9ba31a2b2 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 14:31:35 +0000 Subject: [PATCH 193/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba159f0..c3bdfc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,6 +125,7 @@ testing: - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - set -a + - mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py -- GitLab From e93eece4b4a5dfcf013b3065c21da27bf6deaabd Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 14:39:38 +0000 Subject: [PATCH 194/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3bdfc4..2c52f2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,6 +89,7 @@ testing: when: always paths: - artifacts + - artifacts/logs script: - echo "Test..." @@ -125,7 +126,6 @@ testing: - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - set -a - - mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py -- GitLab From 5208205d5d3ed06cd9e71bb7531b7f85bcb290c4 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 14:48:48 +0000 Subject: [PATCH 195/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c52f2e..0e97e65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,6 +126,7 @@ testing: - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - set -a + - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py -- GitLab From 6348805ab7750dff255cb88786e8dcc5cae16e5a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 14:57:48 +0000 Subject: [PATCH 196/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e97e65..6f3d33f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,6 +26,7 @@ stages: - test - deploy - cleanup + - dast build: @@ -144,3 +145,19 @@ cleanup: - source hive/openstack-etsi.rc - python3 -c 'from utils import *; cleanVM()' + +dast: + stage: dast + environment: + name: $ENV + resource_group: $ENV + tags: + - openstack + rules: + - if: $PIPELINE == "DAST" + include: + - template: DAST.gitlab-ci.yml + variables: + DAST_WEBSITE: $OSM_HOSTNAME + script: + - echo "DAST" -- GitLab From 6608c64df9dfbd563d3235a421acd27fef7242a3 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 15:07:40 +0000 Subject: [PATCH 197/235] Update .gitlab-ci.yml, test.py files --- .gitlab-ci.yml | 1 + test.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f3d33f..90e2f4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,6 +91,7 @@ testing: paths: - artifacts - artifacts/logs + - logs script: - echo "Test..." diff --git a/test.py b/test.py index 0a28139..dffb3cc 100644 --- a/test.py +++ b/test.py @@ -25,4 +25,4 @@ subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], she subprocess.run(["ssh ubuntu@{} '~/scripts/conformance.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying back the logs -subprocess.run(["scp -r ubuntu@{}:~/artifacts/ ~/artifacts/logs".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["scp -r ubuntu@{}:~/artifacts/ ~/logs".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From a6d3374ea6018023bfd105986fce8a2fa33ab6e4 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 15:14:32 +0000 Subject: [PATCH 198/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90e2f4d..0d42ce5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -147,18 +147,3 @@ cleanup: - python3 -c 'from utils import *; cleanVM()' -dast: - stage: dast - environment: - name: $ENV - resource_group: $ENV - tags: - - openstack - rules: - - if: $PIPELINE == "DAST" - include: - - template: DAST.gitlab-ci.yml - variables: - DAST_WEBSITE: $OSM_HOSTNAME - script: - - echo "DAST" -- GitLab From 753682836402bf8a5e563a41da734b60560fe605 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 15:23:28 +0000 Subject: [PATCH 199/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d42ce5..d41dd44 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ variables: GITLAB_TOKEN: $GITLAB_TOKEN ENV: "staging" PIPELINE: "TEST" + DAST_WEBSITE: $OSM_HOSTNAME stages: - build @@ -28,6 +29,10 @@ stages: - cleanup - dast +include: + - template: DAST.gitlab-ci.yaml + + build: stage: build -- GitLab From 067fbbf66bfd2e714fabe1c66a200fdd7b04b3e0 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 15:24:34 +0000 Subject: [PATCH 200/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d41dd44..683c44b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ stages: - dast include: - - template: DAST.gitlab-ci.yaml + - template: DAST.gitlab-ci.yml -- GitLab From 0af311ba6b2b46e05bf6f0293211877f9d3b7380 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 15:27:19 +0000 Subject: [PATCH 201/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 683c44b..3aeb4b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,7 @@ testing: - logs script: - echo "Test..." + - env | grep GITLAB_FEATURES - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash -- GitLab From 25f76569bd670e6310f224dcf321614f52029891 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 15:35:35 +0000 Subject: [PATCH 202/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3aeb4b2..26ae23b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ variables: GITLAB_TOKEN: $GITLAB_TOKEN ENV: "staging" PIPELINE: "TEST" - DAST_WEBSITE: $OSM_HOSTNAME + DAST_WEBSITE: "https://${OSM_HOSTNAME}" stages: - build @@ -100,6 +100,7 @@ testing: script: - echo "Test..." - env | grep GITLAB_FEATURES + - echo $DAST_WEBSITE - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash -- GitLab From 5b7c0d9525166b2572c21af6a4adb717f4e681df Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Mon, 10 Jan 2022 15:54:04 +0000 Subject: [PATCH 203/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26ae23b..f3361e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: GITLAB_API: $GITLAB_API GITLAB_TOKEN: $GITLAB_TOKEN ENV: "staging" - PIPELINE: "TEST" + #PIPELINE: "TEST" DAST_WEBSITE: "https://${OSM_HOSTNAME}" stages: @@ -153,4 +153,6 @@ cleanup: - source hive/openstack-etsi.rc - python3 -c 'from utils import *; cleanVM()' - +dast: + environment: + name: $ENV -- GitLab From b8aa153998053f3b49b15ca4ca99192a8a6d9bfb Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 13:33:57 +0000 Subject: [PATCH 204/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3361e3..2c25b27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: GITLAB_API: $GITLAB_API GITLAB_TOKEN: $GITLAB_TOKEN ENV: "staging" - #PIPELINE: "TEST" + PIPELINE: "TEST" DAST_WEBSITE: "https://${OSM_HOSTNAME}" stages: @@ -138,6 +138,8 @@ testing: - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py + - scp -r ubuntu@172.21.248.85:~/artifacts ~/logs + cleanup: stage: cleanup -- GitLab From 0505e55c3e6487b89aab853026ad84c98f396c8a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 13:45:46 +0000 Subject: [PATCH 205/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c25b27..e127ddd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,6 @@ include: - template: DAST.gitlab-ci.yml - build: stage: build tags: @@ -138,7 +137,10 @@ testing: - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - - scp -r ubuntu@172.21.248.85:~/artifacts ~/logs + - mkdir logs + - scp -v -r ubuntu@172.21.248.85:~/artifacts ~/logs + - ls + - ls logs/ cleanup: -- GitLab From 46c914f7d0e8c090134aed3232e1442e711aa0b5 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 13:52:17 +0000 Subject: [PATCH 206/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e127ddd..f7b8b1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,9 +138,9 @@ testing: - source hive/openstack-etsi.rc - python3 test.py - mkdir logs - - scp -v -r ubuntu@172.21.248.85:~/artifacts ~/logs + - scp -v -r ubuntu@172.21.248.85:~/artifacts ~/directory - ls - - ls logs/ + - ls directory/ cleanup: -- GitLab From a7f6f5f18b6d86cf64c09d57e17ba76b838ddd0a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:15:43 +0000 Subject: [PATCH 207/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7b8b1d..c8fe320 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,7 @@ testing: - source hive/openstack-etsi.rc - python3 test.py - mkdir logs - - scp -v -r ubuntu@172.21.248.85:~/artifacts ~/directory + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/directory/ - ls - ls directory/ -- GitLab From 2280ed93719c58d5b2d3d7c69f7df2c5f90b049c Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:21:09 +0000 Subject: [PATCH 208/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8fe320..283cadf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,6 +140,8 @@ testing: - mkdir logs - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/directory/ - ls + - ls ~/ + - ls ~/directory/ - ls directory/ -- GitLab From 72c5652ca4ffee90ce1afcc342983b6c539d7722 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:27:49 +0000 Subject: [PATCH 209/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 283cadf..6e04da6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,10 +138,8 @@ testing: - source hive/openstack-etsi.rc - python3 test.py - mkdir logs - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/directory/ + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ /directory/ - ls - - ls ~/ - - ls ~/directory/ - ls directory/ -- GitLab From ea41ebc0fe6b57bcd72a3270be33efeb42ccc3b5 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:28:33 +0000 Subject: [PATCH 210/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e04da6..a49bd26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,8 +137,7 @@ testing: - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - - mkdir logs - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ /directory/ + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ /artifacts/logs/ - ls - ls directory/ -- GitLab From 4877333308383cfc2d4d61aa73d0e63ab9c1bc27 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:36:07 +0000 Subject: [PATCH 211/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a49bd26..e5dd012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,7 +137,7 @@ testing: - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ /artifacts/logs/ + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/builds/artifacts/logs/ - ls - ls directory/ -- GitLab From d3f63b3804ed574e368322fcd17dd955a9551c6d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:46:29 +0000 Subject: [PATCH 212/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5dd012..013278d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,9 +137,9 @@ testing: - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/builds/artifacts/logs/ + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/logs/ - ls - - ls directory/ + - mv ~/logs/* ~/builds/artifacts/logs/ cleanup: -- GitLab From d89aceb2d61f59c0c563ac0ebe715457b728ba65 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:52:11 +0000 Subject: [PATCH 213/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 013278d..351d9e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,6 +139,7 @@ testing: - python3 test.py - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/logs/ - ls + - ls ~/builds/ - mv ~/logs/* ~/builds/artifacts/logs/ -- GitLab From fbdc01a9e40a16d489f8efbd9bd2edf0c31e716d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 14:58:36 +0000 Subject: [PATCH 214/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 351d9e3..4925495 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,10 +137,10 @@ testing: - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/logs/ + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/builds/gitlab/artifacts/logs/ - ls - - ls ~/builds/ - - mv ~/logs/* ~/builds/artifacts/logs/ + - ls ~/builds/gitlab/ + #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ cleanup: -- GitLab From deb03c3d814b6324635805c35cc0d3939c9a0e5f Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 15:07:01 +0000 Subject: [PATCH 215/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4925495..ce4f7b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,8 +98,7 @@ testing: - logs script: - echo "Test..." - - env | grep GITLAB_FEATURES - - echo $DAST_WEBSITE + - echo $PWD - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash -- GitLab From 264c83810df63c2955ef580ed7c8a13ffa83315b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 15:10:46 +0000 Subject: [PATCH 216/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce4f7b2..8a60e6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,7 @@ testing: - sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ ~/builds/gitlab/artifacts/logs/ + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs" - ls - ls ~/builds/gitlab/ #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ -- GitLab From 742669a216d606d3ce1bae29fef77b03d8278e96 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Tue, 11 Jan 2022 15:18:05 +0000 Subject: [PATCH 217/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a60e6d..8e8498b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -133,7 +133,7 @@ testing: - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - set -a - - sudo mkdir artifacts/logs + #- sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs" -- GitLab From ea15d0c73946f987fc512d1c4bf7e7e3a4668ecb Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 12 Jan 2022 09:46:13 +0000 Subject: [PATCH 218/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e8498b..7d496b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,9 +136,12 @@ testing: #- sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py + - ls "${PWD}/artifacts/"" + - sudo chmod +w "${PWD}/artifacts/" - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs" - ls - ls ~/builds/gitlab/ + - ls -la $PWD #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ -- GitLab From 50540c095b43c5a91ed84a868c9ccba6592316c2 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 12 Jan 2022 09:52:39 +0000 Subject: [PATCH 219/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d496b5..28c1175 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,9 @@ testing: script: - echo "Test..." - echo $PWD + - ls "${PWD}/artifacts/" + - ls -la $PWD + - ls -la "${PWD}/artifacts/" - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash @@ -136,7 +139,6 @@ testing: #- sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - python3 test.py - - ls "${PWD}/artifacts/"" - sudo chmod +w "${PWD}/artifacts/" - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs" - ls @@ -162,3 +164,5 @@ cleanup: dast: environment: name: $ENV + tags: + - openstack -- GitLab From 236eff71ed296a39a58a39d8f0297dcb53cf1ede Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 12 Jan 2022 09:55:24 +0000 Subject: [PATCH 220/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28c1175..e31082b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,7 @@ testing: script: - echo "Test..." - echo $PWD - - ls "${PWD}/artifacts/" + - ls $PWD - ls -la $PWD - ls -la "${PWD}/artifacts/" -- GitLab From a69d1b3763edceb767f9974c0afe2f92601a8668 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 12 Jan 2022 10:00:27 +0000 Subject: [PATCH 221/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e31082b..5150984 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,9 +99,21 @@ testing: script: - echo "Test..." - echo $PWD - - ls $PWD - ls -la $PWD - - ls -la "${PWD}/artifacts/" + - mkdir artifacts + - mkdir artifacts/logs + - echo -e "$SSH_KEY" > ~/.ssh/id_rsa + - chmod 600 ~/.ssh/id_rsa + - set -a + #- sudo mkdir artifacts/logs + - source hive/openstack-etsi.rc + - python3 test.py + #- sudo chmod +w "${PWD}/artifacts/" + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs" + - ls + - ls ~/builds/gitlab/ + - ls -la $PWD + #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash @@ -133,18 +145,7 @@ testing: -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing - - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - - chmod 600 ~/.ssh/id_rsa - - set -a - #- sudo mkdir artifacts/logs - - source hive/openstack-etsi.rc - - python3 test.py - - sudo chmod +w "${PWD}/artifacts/" - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs" - - ls - - ls ~/builds/gitlab/ - - ls -la $PWD - #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ + cleanup: -- GitLab From 735deb16ea9fe3424aed8168a919a739672c5128 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 12 Jan 2022 10:13:03 +0000 Subject: [PATCH 222/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5150984..bc72ba5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,14 +94,11 @@ testing: when: always paths: - artifacts - - artifacts/logs - - logs script: - echo "Test..." - echo $PWD - ls -la $PWD - mkdir artifacts - - mkdir artifacts/logs - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - set -a @@ -109,7 +106,7 @@ testing: - source hive/openstack-etsi.rc - python3 test.py #- sudo chmod +w "${PWD}/artifacts/" - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs" + - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs/" - ls - ls ~/builds/gitlab/ - ls -la $PWD -- GitLab From f58c8e98c33f89f069d7b0d9b13c1be4ecd6f4a9 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 12 Jan 2022 10:22:43 +0000 Subject: [PATCH 223/235] Update .gitlab-ci.yml, test.py files --- .gitlab-ci.yml | 36 ++++++++++++++++++++---------------- test.py | 4 +++- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc72ba5..36b4db3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,23 +94,13 @@ testing: when: always paths: - artifacts - script: - - echo "Test..." - - echo $PWD - - ls -la $PWD + before_script: - mkdir artifacts - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - set -a - #- sudo mkdir artifacts/logs - - source hive/openstack-etsi.rc - - python3 test.py - #- sudo chmod +w "${PWD}/artifacts/" - - scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs/" - - ls - - ls ~/builds/gitlab/ - - ls -la $PWD - #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ + + script: + - echo "Test..." - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash @@ -141,6 +131,22 @@ testing: -v /$(pwd)/hive/kubeconfig.yaml:/root/.kube/config \ -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing + + + - echo $PWD + - ls -la $PWD + + + - set -a + #- sudo mkdir artifacts/logs + - source hive/openstack-etsi.rc + - python3 test.py + #- sudo chmod +w "${PWD}/artifacts/" + #- scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs/" + #- ls + #- ls ~/builds/gitlab/ + #- ls -la $PWD + #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ @@ -162,5 +168,3 @@ cleanup: dast: environment: name: $ENV - tags: - - openstack diff --git a/test.py b/test.py index dffb3cc..edee9f4 100644 --- a/test.py +++ b/test.py @@ -24,5 +24,7 @@ subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], she #Connecting via SSH & testing subprocess.run(["ssh ubuntu@{} '~/scripts/conformance.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + #Copying back the logs -subprocess.run(["scp -r ubuntu@{}:~/artifacts/ ~/logs".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +#subprocess.run(["scp -r ubuntu@{}:~/artifacts/ ~/logs".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["scp -v -r ubuntu@{}:~/artifacts/ {}/artifacts/logs/".format(ip, os.environ.get('PWD'))], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From a3f18b709e9b5a2aa7888131e2aacf7a46ad5322 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Wed, 12 Jan 2022 10:54:52 +0000 Subject: [PATCH 224/235] Update test.py --- test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test.py b/test.py index edee9f4..0f87ba6 100644 --- a/test.py +++ b/test.py @@ -24,7 +24,5 @@ subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], she #Connecting via SSH & testing subprocess.run(["ssh ubuntu@{} '~/scripts/conformance.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - #Copying back the logs -#subprocess.run(["scp -r ubuntu@{}:~/artifacts/ ~/logs".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) subprocess.run(["scp -v -r ubuntu@{}:~/artifacts/ {}/artifacts/logs/".format(ip, os.environ.get('PWD'))], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- GitLab From 9eccec91f39a1cde332e71712bcbebc45ea0b51d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 12:37:31 +0000 Subject: [PATCH 225/235] Update logs.py, .gitlab-ci.yml, scripts/logs.sh, scripts/deploy.sh, utils.py files --- .gitlab-ci.yml | 27 ++++++--------------------- test.py => logs.py | 2 +- scripts/deploy.sh | 9 ++------- scripts/{conformance.sh => logs.sh} | 0 utils.py | 16 ---------------- 5 files changed, 9 insertions(+), 45 deletions(-) rename test.py => logs.py (85%) rename scripts/{conformance.sh => logs.sh} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36b4db3..e065353 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,18 +23,17 @@ variables: DAST_WEBSITE: "https://${OSM_HOSTNAME}" stages: - - build - - test - deploy - - cleanup + - test - dast + - cleanup include: - template: DAST.gitlab-ci.yml -build: - stage: build +deploy: + stage: deploy tags: - openstack environment: @@ -71,7 +70,6 @@ build: script: - set -a - source hive/openstack-etsi.rc - #- envsubst < $(pwd)/hive/openstack-etsi.rc >> $(pwd)/hive/robot-systest.cfg - cat $(pwd)/hive/openstack-etsi.rc | envsubst > $(pwd)/hive/openstack-etsi.rc - echo $OS_PASSWORD @@ -132,24 +130,11 @@ testing: -v $(pwd)/artifacts:/robot-systest/conformance-tests/reports/ \ opensourcemano/tests:testing-daily -T $TESTS_VERSION -t nothing - - - echo $PWD - - ls -la $PWD - - + after_script: - set -a - #- sudo mkdir artifacts/logs - source hive/openstack-etsi.rc - - python3 test.py - #- sudo chmod +w "${PWD}/artifacts/" - #- scp -v -r ubuntu@172.21.248.85:~/artifacts/ "${PWD}/artifacts/logs/" - #- ls - #- ls ~/builds/gitlab/ - #- ls -la $PWD - #- mv ~/logs/* ~/builds/artifacts/gitlab/logs/ + - python3 logs.py - - cleanup: stage: cleanup diff --git a/test.py b/logs.py similarity index 85% rename from test.py rename to logs.py index 0f87ba6..45fab2e 100644 --- a/test.py +++ b/logs.py @@ -22,7 +22,7 @@ print(ip) subprocess.run(["ssh-keyscan -t ECDSA {} >> ~/.ssh/known_hosts".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Connecting via SSH & testing -subprocess.run(["ssh ubuntu@{} '~/scripts/conformance.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +subprocess.run(["ssh ubuntu@{} '~/scripts/logs.sh'".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) #Copying back the logs subprocess.run(["scp -v -r ubuntu@{}:~/artifacts/ {}/artifacts/logs/".format(ip, os.environ.get('PWD'))], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index ec819f4..7d09da0 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -2,8 +2,6 @@ echo "Installing" -#mkdir artifacts -#mkdir reports sudo apt-get update sudo apt-get install -y \ ca-certificates \ @@ -14,7 +12,8 @@ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o echo \ "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null -sudo apt-get update # +sudo apt-get update + #Docker setup sudo apt-get install docker-ce docker-ce-cli containerd.io -y cat << EOF | sudo tee /etc/docker/daemon.json @@ -38,16 +37,12 @@ sudo snap alias microk8s.kubectl kubectl rm install_osm.sh #Configuring ENV variables - -#TODO scp config file set -a source ~/hive/openstack-etsi.rc export OSM_HOSTNAME=$(juju config -m osm nbi site_url | sed "s/http.*\?:\/\///"):443 export PROMETHEUS_HOSTNAME=$(juju config -m osm prometheus site_url | sed "s/http.*\?:\/\///") export PROMETHEUS_PORT=80 export JUJU_PASSWORD=$(juju gui 2>&1 | grep password | cut -d: -f2 | xargs) - -#TODO add to bashrc echo 'export OSM_HOSTNAME='$OSM_HOSTNAME >> ~/.bashrc diff --git a/scripts/conformance.sh b/scripts/logs.sh similarity index 100% rename from scripts/conformance.sh rename to scripts/logs.sh diff --git a/utils.py b/utils.py index c811ad1..0c87ccd 100644 --- a/utils.py +++ b/utils.py @@ -5,7 +5,6 @@ import subprocess import sys def cleanVM(): - if (os.environ.get('OS_TOKEN') is None): getAuth() @@ -15,12 +14,9 @@ def cleanVM(): res = computeRequest("DELETE", "servers/{}".format(instanceId), None) print(res.status_code) print(res.text) - else: - print("No cleaning to do!") def getAuth(): - #Source clouds.yaml/openstack.rc file first url = "{}/auth/tokens?nocatalog".format(os.environ.get('OS_AUTH_URL')) header = {"Content-Type": "application/json"} payload = '{ "auth": { "identity": { "methods": ["password"],"password": {"user": {"domain": {"name": "%s"},"name": "%s", "password": "%s"} } }, "scope": { "project": { "domain": { "name": "%s"}, "name": "%s"} } }}' % (os.environ.get("OS_USER_DOMAIN_NAME"), os.environ.get("OS_USERNAME"), os.environ.get("OS_PASSWORD"), os.environ.get("OS_PROJECT_DOMAIN_ID"), os.environ.get("OS_PROJECT_NAME")) @@ -52,20 +48,8 @@ def gitlabRequest(method, endpoint, payload): header = {"Authorization": "Bearer {}".format(os.environ.get('GITLAB_TOKEN'))} filter = "?filter[environment_scope]={}".format(os.environ.get('CI_ENVIRONMENT_NAME')) print("{} : {}/{}".format(method, url, endpoint)) - #print(filter) res = requests.request("{}".format(method), "{}/{}{}".format(url, endpoint, filter), headers=header, data=payload) return res -def getLogs(): - - if (os.environ.get('OS_TOKEN') is None): - getAuth() - - #Retrieving instance ip - res = computeRequest("GET", "servers/{}".format(id), None) - ip = ((res.json())['server']['addresses']['osm-ext'][0])['addr'] - - subprocess.run(["scp ubuntu@{} 'scripts/conformance.sh' > artifacts/test.log".format(ip)], shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - -- GitLab From 96a14a4f933eb72323c12b2f9c4229328368fb1e Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 12:51:24 +0000 Subject: [PATCH 226/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e065353..a769f2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,11 @@ stages: - dast - cleanup +workflow: + rules: + - if: $CI_MERGE_REQUEST_ID + when: never + include: - template: DAST.gitlab-ci.yml -- GitLab From a78fb9089a74d7a47dbc97f766ef87821e72c39b Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 12:53:29 +0000 Subject: [PATCH 227/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a769f2c..cccf2ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,7 @@ workflow: rules: - if: $CI_MERGE_REQUEST_ID when: never + - if: $CI_COMMIT_BRANCH include: - template: DAST.gitlab-ci.yml -- GitLab From 25ba50eaa065ad5aebd813482b3f9c9a6c9b7049 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 13:04:05 +0000 Subject: [PATCH 228/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cccf2ab..2b3b361 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,12 +20,10 @@ variables: GITLAB_TOKEN: $GITLAB_TOKEN ENV: "staging" PIPELINE: "TEST" - DAST_WEBSITE: "https://${OSM_HOSTNAME}" stages: - deploy - test - - dast - cleanup workflow: @@ -34,9 +32,6 @@ workflow: when: never - if: $CI_COMMIT_BRANCH -include: - - template: DAST.gitlab-ci.yml - deploy: stage: deploy @@ -47,7 +42,7 @@ deploy: resource_group: $ENV rules: - - if: $PIPELINE == "DEPLOY" + - if: $PIPELINE == "DEPLOY" || $PIPELINE == "FULL" artifacts: when: always @@ -57,17 +52,10 @@ deploy: before_script: - mkdir artifacts - - mkdir reports - - ls - - ls ~/.ssh/ - echo -e "$SSH_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - - ls ~/.ssh/ - - wc -l ~/.ssh/id_rsa - - - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner @@ -77,12 +65,9 @@ deploy: - set -a - source hive/openstack-etsi.rc - cat $(pwd)/hive/openstack-etsi.rc | envsubst > $(pwd)/hive/openstack-etsi.rc - - - echo $OS_PASSWORD - - ls - python3 --version - python3 deploy.py - - ls + testing: @@ -93,11 +78,12 @@ testing: - openstack resource_group: $ENV rules: - - if: $PIPELINE == "TEST" + - if: $PIPELINE == "TEST" || $PIPELINE == "FULL" artifacts: when: always paths: - artifacts + before_script: - mkdir artifacts - echo -e "$SSH_KEY" > ~/.ssh/id_rsa @@ -150,7 +136,7 @@ cleanup: tags: - openstack rules: - - if: $PIPELINE == "CLEANUP" + - if: $PIPELINE == "CLEANUP" || $PIPELINE == "FULL" script: - set -a - source hive/openstack-etsi.rc -- GitLab From 3b47fe4f5c26494dd4a5d7c78ac655a6427ccfb6 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 13:06:22 +0000 Subject: [PATCH 229/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b3b361..db29928 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -142,6 +142,3 @@ cleanup: - source hive/openstack-etsi.rc - python3 -c 'from utils import *; cleanVM()' -dast: - environment: - name: $ENV -- GitLab From 943c5de31c756439eaa68ed8ac37308244b7d431 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 13:56:51 +0000 Subject: [PATCH 230/235] Update scripts/deploy.sh, .gitlab-ci.yml files --- .gitlab-ci.yml | 2 +- scripts/deploy.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db29928..e351d20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,7 @@ cleanup: tags: - openstack rules: - - if: $PIPELINE == "CLEANUP" || $PIPELINE == "FULL" + - if: $PIPELINE == "CLEANUP" script: - set -a - source hive/openstack-etsi.rc diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 7d09da0..936c0ec 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -47,6 +47,7 @@ echo 'export OSM_HOSTNAME='$OSM_HOSTNAME >> ~/.bashrc #Creating envfile +source hive/openstack-etsi.rc# echo "Creating envfile" cat << EOF >> robot-systest.cfg -- GitLab From 4b897c937ec76d80c735e05a1f33816a9d4795e2 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 14:25:07 +0000 Subject: [PATCH 231/235] Update scripts/deploy.sh --- scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 936c0ec..8fa6c76 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -47,7 +47,7 @@ echo 'export OSM_HOSTNAME='$OSM_HOSTNAME >> ~/.bashrc #Creating envfile -source hive/openstack-etsi.rc# +source hive/openstack-etsi.rc echo "Creating envfile" cat << EOF >> robot-systest.cfg -- GitLab From 8558865d56885fe678101ace74021762db56ffec Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 15:12:20 +0000 Subject: [PATCH 232/235] Update scripts/deploy.sh --- scripts/deploy.sh | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 8fa6c76..5c493fd 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -81,8 +81,30 @@ EOF cat clouds.yaml #Creating a VIM -osm vim-create --name ${VIM_TARGET} --user ${OS_USERNAME} --password ${OS_PASSWORD} --tenant ${OS_PROJECT_NAME} \ ---auth_url ${OS_AUTH_URL} --account_type openstack --description vim \ ---config "{management_network_name: ${VIM_MGMT_NET}, dataplane_physical_net: ${DATAPLANE:-physnet2}}" || true - - +attempts=3 +while [$attempts -ge 0]; do + echo -e "\n$( date '+%F_%H:%M:%S' ) Creating VIM ${VIM_TARGET}" + osm vim-create --name ${VIM_TARGET} --user ${OS_USERNAME} --password ${OS_PASSWORD} --tenant ${OS_PROJECT_NAME} \ + --auth_url ${OS_AUTH_URL} --account_type openstack --description vim \ + --config "{management_network_name: ${VIM_MGMT_NET}, dataplane_physical_net: ${DATAPLANE:-physnet2}}" || true + STATUS="" + i=0 + while [[ ${STATUS} != "ENABLED" ]] + do + ((i++)) + if [[ $i -eq 5 ]]; then + echo "VIM stuck for more than 50 seconds as: ${VIM_LIST}" + osm vim-delete --force ${VIM_TARGET} + sleep 5 + break + fi + sleep 10 + VIM_LIST=`osm vim-list --long | grep ${VIM_TARGET}` + echo VIM status: ${VIM_LIST} + STATUS=`echo ${VIM_LIST} | grep -io ENABLED` + done + if [[ ${STATUS} = "ENABLED" ]] ; then + break + fi + ((attempts--)) +done -- GitLab From 844d7e7bb469329e1c65c3df500f0d0edb64be7a Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 16:14:10 +0000 Subject: [PATCH 233/235] Update scripts/deploy.sh --- scripts/deploy.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 5c493fd..d9da40b 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -47,7 +47,6 @@ echo 'export OSM_HOSTNAME='$OSM_HOSTNAME >> ~/.bashrc #Creating envfile -source hive/openstack-etsi.rc echo "Creating envfile" cat << EOF >> robot-systest.cfg @@ -82,7 +81,7 @@ cat clouds.yaml #Creating a VIM attempts=3 -while [$attempts -ge 0]; do +while [ $attempts -ge 0 ] ; do echo -e "\n$( date '+%F_%H:%M:%S' ) Creating VIM ${VIM_TARGET}" osm vim-create --name ${VIM_TARGET} --user ${OS_USERNAME} --password ${OS_PASSWORD} --tenant ${OS_PROJECT_NAME} \ --auth_url ${OS_AUTH_URL} --account_type openstack --description vim \ -- GitLab From 2c9bee651785d204c7809969d162029308ae971d Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Thu, 13 Jan 2022 17:16:47 +0000 Subject: [PATCH 234/235] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e351d20..6500a91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,12 +59,13 @@ deploy: - echo "GitLab Runner Installation" - curl -L "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh" | sudo bash - sudo apt-get install gitlab-runner + - sudo apt-get install -y moreutils script: - set -a - source hive/openstack-etsi.rc - - cat $(pwd)/hive/openstack-etsi.rc | envsubst > $(pwd)/hive/openstack-etsi.rc + - envsubst < $(pwd)/hive/openstack-etsi.rc | sponge $(pwd)/hive/openstack-etsi.rc - python3 --version - python3 deploy.py -- GitLab From 8e2a0da55f23f325bf7200ce7a8f713a906d5cb6 Mon Sep 17 00:00:00 2001 From: veleza <166-veleza@users.noreply.osm.etsi.org> Date: Fri, 14 Jan 2022 09:03:31 +0000 Subject: [PATCH 235/235] Update utils.py, deploy.py, logs.py, .gitlab-ci.yml files --- .gitlab-ci.yml | 1 - deploy.py | 6 ------ logs.py | 5 ----- utils.py | 4 ++-- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6500a91..e4066f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,6 @@ deploy: - set -a - source hive/openstack-etsi.rc - envsubst < $(pwd)/hive/openstack-etsi.rc | sponge $(pwd)/hive/openstack-etsi.rc - - python3 --version - python3 deploy.py diff --git a/deploy.py b/deploy.py index f47e37a..c15eda4 100644 --- a/deploy.py +++ b/deploy.py @@ -1,9 +1,3 @@ -import requests -import os -import time -import subprocess -import sys - from utils import * imageRef = "3a7f7ce7-7a20-4fe5-8f3e-e62151658f84" diff --git a/logs.py b/logs.py index 45fab2e..6c25aeb 100644 --- a/logs.py +++ b/logs.py @@ -1,8 +1,3 @@ -import requests -import os -import time -import subprocess -import sys from utils import * diff --git a/utils.py b/utils.py index 0c87ccd..c881c40 100644 --- a/utils.py +++ b/utils.py @@ -24,12 +24,12 @@ def getAuth(): print(res.status_code) if res.status_code == 201: - print("Yay") + print("Authentification sucessful") token = res.headers['X-Subject-Token'] os.environ["OS_TOKEN"] = token print(os.environ.get('OS_TOKEN')) else: - print("Nay") + print("Authentification failed") def computeRequest(method, endpoint, payload): url = os.environ.get('OS_COMPUTE_API') -- GitLab