Bpg img

.github/workflows/integration-build-product.yml

@@ -75,9 +75,9 @@ on:
         required: true
       proxmox_api_url:
         required: true
-      proxmox_api_token_id:
+      proxmox_ve_username:
         required: true
-      proxmox_api_token_secret:
+      proxmox_ve_password:
         required: true
       ssh_priv_key:
         required: true
@@ -100,12 +100,12 @@ env:
   MID_REGISTRY: registry.cloud.mov.ai
   USERSPACE_FOLDER_PATH: userspace
   REMOTE_WORKSPACE_PATH: workspace
-  PROVISION_INFRA_REPO: "devops-tf-proxmox-fleet"
-  PROVISION_INFRA_VERSION: "0.1.0-7"
+  PROVISION_INFRA_REPO: "devops-tf-proxmox-bpg"
+  PROVISION_INFRA_VERSION: "0.0.0-5"
   # slack channel movai-projects
-  SLACK_CHANNEL: ${{ inputs.overwrite_slack_channel }}
+  #SLACK_CHANNEL: ${{ inputs.overwrite_slack_channel }}
   # development slack channel
-  #SLACK_CHANNEL: "C05K2KF1UP8"
+  SLACK_CHANNEL: "C05K2KF1UP8"
   PROJECT_DATA_VIEWER_API: "https://personal-7vf0v2cu.outsystemscloud.com/ProjectDataViewer5/rest/V1//CreateProject"
   MINIO_S3_URL: "https://s3.mov.ai"
 
@@ -1160,8 +1160,9 @@ jobs:
           rm -rf $provision_infra_dir
           export PATH="$HOME/.local/bin:$PATH"
           integration-pipeline fetch_by_tag --repo $provision_infra_repo_name --version $provision_infra_version --gh_api_user $GITHUB_API_USR --gh_api_pwd ${{ secrets.auto_commit_pwd }} --target_dir $provision_infra_dir
+
           ls -la $provision_infra_dir
-          echo "target_dir=${provision_infra_dir}/hosts/generic/" >> $GITHUB_OUTPUT
+          echo "target_dir=${provision_infra_dir}/" >> $GITHUB_OUTPUT
 
       - name: Define Instance names
         if: ${{ inputs.with_simulation_tests }}
@@ -1190,25 +1191,48 @@ jobs:
 
         env:
           TF_VAR_number_agents: 0
+          # TF_VAR_proxmox_api_url: ${{ secrets.proxmox_api_url }}
+          # TF_VAR_proxmox_api_token_id: ${{ secrets.proxmox_api_token_id }}
+          # TF_VAR_proxmox_api_token_secret: ${{ secrets.proxmox_api_token_secret }}
+          # TF_VAR_provision_ssh_pem: ${{ secrets.ssh_priv_key }}
+          # TF_VAR_ip_list: '["dhcp"]'
+          # TF_VAR_storage: "local-lvm"
+          # TF_VAR_proxmox_host_list: '["mary"]'
+          # TF_VAR_vm_gateway: "10.10.1.254"
+          # TF_VAR_ip_mask: 23
+          # TF_VAR_bios: "ovmf"
+          # TF_VAR_pool: "IP-Temp-VMs"
+          # TF_VAR_tags: "ip-simul-ci"
+          # TF_VAR_fleet_hosts_user: "devops"
+          # TF_VAR_template_name: "u22dci-gpu"
+          # TF_VAR_fleet_manager_name: ${{ steps.infra_names.outputs.simul_prefix }}
+          # TF_VAR_fleet_manager_memory: 51200
+          # TF_VAR_fleet_manager_cores: 14
+          # TF_VAR_fleet_manager_disk_size: "110G"
+          # TF_VAR_fleet_manager_balloon: 0
+          TF_VAR_proxmox_ve_username: ${{ secrets.proxmox_ve_username }}
+          TF_VAR_proxmox_ve_password: ${{ secrets.proxmox_ve_password }}
+          TF_VAR_proxmox_host: "mary"
           TF_VAR_proxmox_api_url: ${{ secrets.proxmox_api_url }}
-          TF_VAR_proxmox_api_token_id: ${{ secrets.proxmox_api_token_id }}
-          TF_VAR_proxmox_api_token_secret: ${{ secrets.proxmox_api_token_secret }}
-          TF_VAR_provision_ssh_pem: ${{ secrets.ssh_priv_key }}
-          TF_VAR_ip_list: '["dhcp"]'
-          TF_VAR_storage: "local-lvm"
-          TF_VAR_proxmox_host_list: '["mary"]'
-          TF_VAR_vm_gateway: "10.10.1.254"
-          TF_VAR_ip_mask: 23
-          TF_VAR_bios: "ovmf"
-          TF_VAR_pool: "IP-Temp-VMs"
-          TF_VAR_tags: "ip-simul-ci"
-          TF_VAR_fleet_hosts_user: "devops"
-          TF_VAR_template_name: "u22dci-gpu"
-          TF_VAR_fleet_manager_name: ${{ steps.infra_names.outputs.simul_prefix }}
-          TF_VAR_fleet_manager_memory: 51200
-          TF_VAR_fleet_manager_cores: 14
-          TF_VAR_fleet_manager_disk_size: "110G"
-          TF_VAR_fleet_manager_balloon: 0
+          TF_VAR_vm_name: "test-bpg-tf"
+          TF_VAR_vm_memory: 8192
+          TF_VAR_vm_cores: 4
+          TF_VAR_vm_core_type: "host"
+          TF_VAR_vm_disk_size: 20
+          TF_VAR_vm_disk_interface: "scsi0"
+          TF_VAR_vm_type: "q35"
+          TF_VAR_vm_os_type: "l26"
+          TF_VAR_vm_network_bridge: "vmbr0"
+          TF_VAR_vm_network_ip_address: "dhcp"
+          TF_VAR_vm_disk_storage: "nas-mary"
+          TF_VAR_vm_img_id: "nas-mary:iso/0.0.1-13-desktop-jammy_local.img"
+          TF_VAR_vm_bios: "ovmf"
+          TF_VAR_cloud_init_storage: "local"
+          TF_VAR_hostpci_device: "hostpci0"
+          TF_VAR_hostpci_device_id: "0000:01:00.0"
+          TF_VAR_hostpci_device_pcie: "true"
+          TF_VAR_hostpci_device_xvga: "true"
+          # TF_VAR_hostpci_device_rombar: "true"
 
       - name: Gather Terraform outputs
         if: ${{ inputs.with_simulation_tests }}
@@ -1222,18 +1246,18 @@ jobs:
           echo "host_user=$(echo $user | sed "s;\";;g")" >> $GITHUB_OUTPUT
           echo "ssh_connect_string=$(echo $user | sed "s;\";;g")@$(echo $ip | sed "s;\";;g")" >> $GITHUB_OUTPUT
 
-      - name: Configure SSH
-        if: ${{ inputs.with_simulation_tests }}
-        id: remote_ssh_setup
-        shell: bash
-        run: |
-          ssh-keygen -f ~/.ssh/known_hosts -R ${{ steps.infra_outputs.outputs.host_ip }} || true
-          ssh-keyscan -H ${{ steps.infra_outputs.outputs.host_ip }} >> ~/.ssh/known_hosts || true
+      # - name: Configure SSH
+      #   if: ${{ inputs.with_simulation_tests }}
+      #   id: remote_ssh_setup
+      #   shell: bash
+      #   run: |
+      #     ssh-keygen -f ~/.ssh/known_hosts -R ${{ steps.infra_outputs.outputs.host_ip }} || true
+      #     ssh-keyscan -H ${{ steps.infra_outputs.outputs.host_ip }} >> ~/.ssh/known_hosts || true
 
-          ssh ${{ steps.infra_outputs.outputs.ssh_connect_string }} -i ~/.ssh/ci_priv_key.pem -o StrictHostKeyChecking=no '
-            set -e
-            cloud-init status --wait; rm -rf ./${{ env.REMOTE_WORKSPACE_PATH }}; mkdir -p ./${{ env.REMOTE_WORKSPACE_PATH }}
-          '
+      #     ssh ${{ steps.infra_outputs.outputs.ssh_connect_string }} -i ~/.ssh/ci_priv_key.pem -o StrictHostKeyChecking=no '
+      #       set -e
+      #       cloud-init status --wait; rm -rf ./${{ env.REMOTE_WORKSPACE_PATH }}; mkdir -p ./${{ env.REMOTE_WORKSPACE_PATH }}
+      #     '
 
 
       - name: Prepare Devops provisioning slack message
@@ -1604,22 +1628,42 @@ jobs:
         env:
           TF_VAR_number_agents: 0
           TF_VAR_proxmox_api_url: ${{ secrets.proxmox_api_url }}
-          TF_VAR_proxmox_api_token_id: ${{ secrets.proxmox_api_token_id }}
-          TF_VAR_proxmox_api_token_secret: ${{ secrets.proxmox_api_token_secret }}
+          TF_VAR_proxmox_ve_username: ${{ secrets.proxmox_ve_username }}
+          TF_VAR_proxmox_ve_password: ${{ secrets.proxmox_ve_password }}
           TF_VAR_provision_ssh_pem: ${{ secrets.ssh_priv_key }}
-          TF_VAR_ip_list: '["dhcp"]'
-          TF_VAR_proxmox_host_list: '["mary"]'
-          TF_VAR_vm_gateway: "10.10.1.254"
-          TF_VAR_ip_mask: 23
-          TF_VAR_bios: "ovmf"
-          TF_VAR_pool: "IP-Temp-VMs"
-          TF_VAR_tags: "ip-simul-ci"
-          TF_VAR_fleet_hosts_user: "devops"
-          TF_VAR_template_name: "u22dci-gpu"
-          TF_VAR_fleet_manager_name: ${{ steps.infra_names.outputs.simul_prefix }}
-          TF_VAR_fleet_manager_memory: 30000
-          TF_VAR_fleet_manager_cores: 10
-          TF_VAR_fleet_manager_disk_size: "110G"
+          # TF_VAR_ip_list: '["dhcp"]'
+          # TF_VAR_proxmox_host_list: '["mary"]'
+          # TF_VAR_vm_gateway: "10.10.1.254"
+          # TF_VAR_ip_mask: 23
+          # TF_VAR_bios: "ovmf"
+          # TF_VAR_pool: "IP-Temp-VMs"
+          # TF_VAR_tags: "ip-simul-ci"
+          # TF_VAR_fleet_hosts_user: "devops"
+          # TF_VAR_template_name: "u22dci-gpu"
+          # TF_VAR_fleet_manager_name: ${{ steps.infra_names.outputs.simul_prefix }}
+          # TF_VAR_fleet_manager_memory: 30000
+          # TF_VAR_fleet_manager_cores: 10
+          # TF_VAR_fleet_manager_disk_size: "110G"
+          # TF_VAR_proxmox_host: "mary"
+          # TF_VAR_proxmox_api_url: ${{ secrets.proxmox_api_url }}
+          TF_VAR_vm_name: "test-bpg-tf"
+          TF_VAR_vm_memory: 8192
+          TF_VAR_vm_cores: 4
+          TF_VAR_vm_core_type: "host"
+          TF_VAR_vm_disk_size: 20
+          TF_VAR_vm_disk_interface: "scsi0"
+          TF_VAR_vm_type: "q35"
+          TF_VAR_vm_os_type: "l26"
+          TF_VAR_vm_network_bridge: "vmbr0"
+          TF_VAR_vm_network_ip_address: "dhcp"
+          TF_VAR_vm_disk_storage: "nas-mary"
+          TF_VAR_vm_img_id: "nas-mary:iso/0.0.1-13-desktop-jammy_local.img"
+          TF_VAR_vm_bios: "ovmf"
+          TF_VAR_cloud_init_storage: "local"
+          TF_VAR_hostpci_device: "hostpci0"
+          TF_VAR_hostpci_device_id: "0000:01:00.0"
+          TF_VAR_hostpci_device_pcie: "true"
+          TF_VAR_hostpci_device_xvga: "true"
 
   publish:
     needs: [Install-Robot, Install-Simulator-Robot, Validation-Simulator-Tests]

README.md

@@ -3,4 +3,4 @@
 ## - name: Publish to project data viewer
 This step publishes data to the [project data viewer website](https://personal-7vf0v2cu.outsystemscloud.com/ProjectDataViewer5/). The site is used to visualize which packages are installed in the spawner container in the projects. By default this step is disabled. To enable set the `use_project_data_viewer` parameter to true in the workflow file of your project. If failed the step is skipped.
 
-The credentials to the site is given in the [confluence page](https://movai.atlassian.net/wiki/spaces/MF/pages/2403074053/Project+Data+Viewer).
+The credentials to the site is given in the [confluence page](https://movai.atlassian.net/wiki/spaces/MF/pages/2403074053/Project+Data+Viewer).