diff --git a/tasks/main.yml b/tasks/main.yml index 0d63e2acdab97ad338c0fe75e2bd66a98ec05f22..745d058e20283a01495e21d88aa7bf63a3991474 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -7,7 +7,13 @@ - debug: var: paas_ci_workdir + + - block: + - name: template_url + debug: + var: paas_ci_test.template_url + - name: Get template get_url: url: "{{ paas_ci_test.template_url }}" diff --git a/tests/test-jupyter-vm.yml b/tests/test-jupyter-vm.yml index 5d3be47658947c3f78ef1812c13484804846a7a9..e92e9ab0d821fdb193c212100a8a716ef2eab737 100644 --- a/tests/test-jupyter-vm.yml +++ b/tests/test-jupyter-vm.yml @@ -11,6 +11,6 @@ name: paas-ci vars: paas_ci_test: - template_url: https://baltig.infn.it/infn-cloud/tosca-templates/-/blob/master/jupyter/jupyter_vm.yaml + template_url: https://baltig.infn.it/infn-cloud/tosca-templates/-/raw/master/jupyter/jupyter_vm.yaml inputs: | '{ "users": [{"os_user_add_to_sudoers": true, "os_user_name": "scans", "os_user_ssh_public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmQvE3sXtg4D/KYzhCdP6cICvy5foeSkHenKTisxdGJK8L0cDmV+4k7fIah1GIXrldjQBGWHSTbIj1qRTXG2OPWFxeDoXIN1FyKxwdOgwIfzIRtVq18VZEqt9eOiNUXN8jGoEAgcU7obqXuPqKAndk4tyOnSDuVnfnZWAiesVvWK16GEq0PAxBhJoX3eq501ilsNnJZDMEnvQEgtFuIbADEanrhRV3yaEca+9vFyOQRkyxDF8Gn6P/wZ4oe35bdgXxi/hg8JVKYbDCLlT+Fdi+OC3trRhwCcBSvDFD0ZQ8oLemzUk+732TqR+I8gVjPE9fiNF+/mrj5OX55SDr8Qgf scans"}]}' diff --git a/utils/Dockerfile b/utils/Dockerfile index dc61641c8b80bda16139f2abcf5520cfef282de8..c11f39430a84eadd50f6e2257737e069d036c8b7 100644 --- a/utils/Dockerfile +++ b/utils/Dockerfile @@ -3,8 +3,20 @@ FROM jenkins/ssh-agent ARG ORCHENT_VERSION=1.2.9.rc1 ARG LIBQRENCODE_PATH=/tmp/libqrencode.deb -RUN DEBIAN_FRONTEND=noninteractive \ - && apt-get update && apt-get install -y gnupg2 apt-utils software-properties-common wget nmap +RUN DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + gnupg2 \ + apt-utils \ + software-properties-common \ + wget \ + git \ + ansible \ + python3-pip \ + iproute2 \ + net-tools \ + dialog \ + vim \ + openssh-client RUN DEBIAN_FRONTEND=noninteractive \ && wget -O ${LIBQRENCODE_PATH} http://archive.ubuntu.com/ubuntu/pool/universe/q/qrencode/libqrencode3_3.4.4-1build1_amd64.deb \ @@ -14,7 +26,7 @@ RUN DEBIAN_FRONTEND=noninteractive \ RUN DEBIAN_FRONTEND=noninteractive \ && apt-get update \ - && apt-get install -y git ansible python3-pip openssh-client iproute2 net-tools oidc-agent vim \ + && apt-get install -y oidc-agent \ && wget https://github.com/indigo-dc/orchent/releases/download/v${ORCHENT_VERSION}/orchent_${ORCHENT_VERSION}_amd64.deb \ && dpkg -i orchent_${ORCHENT_VERSION}_amd64.deb \ && pip install gvm-tools jq yq \ @@ -25,7 +37,7 @@ RUN useradd -ms /bin/bash gmp \ COPY id_rsa /home/gmp/.ssh COPY known_hosts /home/gmp/.ssh -COPY script.py hosts /home/gmp/script.py +COPY script.py /home/gmp/script.py RUN chown -R gmp:gmp /home/gmp /tmp \ && chmod 0600 /home/gmp/.ssh/id_rsa \ diff --git a/vars/main.yml b/vars/main.yml index 6759e0c7823b8712a2589c2f5bc78666294d606b..3096c6fceb9865fce9cba42c383d284308e63f86 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -4,5 +4,5 @@ paas_ci_test_step: "" paas_ci_test: template_url: https://baltig.infn.it/infn-cloud/tosca-templates/-/raw/master/jupyter/jupyter_vm.yaml inputs: | - '{ "users": [{"os_user_add_to_sudoers": true, "os_user_name": "antonacci", "os_user_ssh_public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDE887DQ8WcX5f8d9/MakzMhG/QovKzjrgDzJ0CwjxKm3kUYildhPcUtj7k73WdcP06st6cWpxQ+7HmFseuX+1GASorENAqMHbOvoT0K6pkNlgwgyDOYdR5JSnXIEfR7gTE391SuYN8lbLEvFCscNHYP6814tYochO+sSlpa3XJ2nHvvVp4Ikt/X2Q+zidkKzuMUwFeGf4MZz93Nlwcbg3UM+ENEjjksb7Rqxx2WtYAv8Gn6Jr1X3PmvMoaO9HBgZaosp7NXh20LRHJW+aiEKcr+vzFlgUjTcd/h2CrkgS6+AhjKqpMNS1sS/QuOvPVMUNr1dSOkmAR5EwfHcXpY9RL marica@MacBook-Air-di-marica.local"}]}' + '{ "users": [{"os_user_add_to_sudoers": true, "os_user_name": "scans", "os_user_ssh_public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmQvE3sXtg4D/KYzhCdP6cICvy5foeSkHenKTisxdGJK8L0cDmV+4k7fIah1GIXrldjQBGWHSTbIj1qRTXG2OPWFxeDoXIN1FyKxwdOgwIfzIRtVq18VZEqt9eOiNUXN8jGoEAgcU7obqXuPqKAndk4tyOnSDuVnfnZWAiesVvWK16GEq0PAxBhJoX3eq501ilsNnJZDMEnvQEgtFuIbADEanrhRV3yaEca+9vFyOQRkyxDF8Gn6P/wZ4oe35bdgXxi/hg8JVKYbDCLlT+Fdi+OC3trRhwCcBSvDFD0ZQ8oLemzUk+732TqR+I8gVjPE9fiNF+/mrj5OX55SDr8Qgf scans"}]}' endpoints: ["jupyter_notebook", "grafana_endpoint"]