MGMT-19450: Update oci e2e test

Makefile

@@ -234,9 +234,6 @@ destroy_nutanix:
 destroy_vsphere:
 	PLATFORM=vsphere make destroy_terraform_controller
 
-destroy_oci:
-	PLATFORM=oci make destroy_terraform_controller
-
 #######
 # Run #
 #######

ansible_files/oci_generic_create_ci_machine_playbook.yml

@@ -45,4 +45,3 @@
     - name: oci/setup_oci_for_test_infra
       vars:
         ci_machine: "{{ groups['primary'][0] }}"
-        infra: "{{ deployed_tf.outputs.infra.value }}"

ansible_files/oci_generic_destroy_ci_machine_playbook.yml

@@ -4,7 +4,7 @@
     - name: Destroy OCI instrastructure provisionned by test-infra
       ansible.builtin.shell: |
         source /root/config.sh
-        make destroy_oci
+        make destroy_nodes_oci
       args:
         chdir: /home/assisted
       retries: 5
@@ -24,4 +24,4 @@
   vars:
     oci_terraform_workdir: "{{ [playbook_dir, '..', 'terraform_files', 'oci-ci-machine'] | path_join | realpath }}"
   roles:
-    - name: oci/destroy_infra
+    - name: oci/destroy_infra

ansible_files/roles/oci/cleanup_resources/defaults/main.yml

@@ -10,4 +10,5 @@ excluded_types:
   - oci_network_load_balancer_backend
   - oci_network_load_balancer_backend_set
   - oci_network_load_balancer_listener
+  - oci_objectstorage_preauthrequest
 expired_after_hours: 7

ansible_files/roles/oci/create_infra/tasks/main.yml

@@ -2,7 +2,7 @@
   ansible.builtin.template:
     src: "terraform.tfvars.j2"
     dest: "{{ oci_tf_vars_file }}"
-    mode: 0644
+    mode: '0644'
 
 - name: "Deploy Terraform Instance"
   community.general.terraform:
@@ -17,7 +17,7 @@
   ansible.builtin.copy:
     src: "{{ oci_terraform_workdir }}/terraform.tfstate"
     dest: "{{ oci_tf_state_file }}"
-    mode: 0644
+    mode: '0644'
   when: oci_tf_state_file is defined
 
 - name: "Add ci_machine to inventory"
@@ -36,3 +36,13 @@
   delay: 30
   register: result
   until: result is succeeded
+
+- name: Update all packages on host
+  ansible.builtin.dnf:
+    name: "*"
+    state: latest
+  delegate_to: "{{ deployed_tf.outputs.ci_machine_inventory.value.display_name }}"
+
+- name: Reboot machine
+  ansible.builtin.reboot:
+  delegate_to: "{{ deployed_tf.outputs.ci_machine_inventory.value.display_name }}"

ansible_files/roles/oci/setup_oci_for_test_infra/defaults/main.yml

@@ -0,0 +1,5 @@
+oci_compute_shape: "VM.Standard.E4.Flex"
+oci_control_plane_shape: "VM.Standard.E4.Flex"
+
+oci_infrastructure_zip_url: "https://github.com/dfoster-oracle/oci-openshift/releases/download/v1.0.0-preview/create-cluster-v0.1.0.zip"
+oci_infrastructure_zip_file: "{{ hostvars[ci_machine].ansible_user_dir }}/oci/infrastructure.zip"

ansible_files/roles/oci/setup_oci_for_test_infra/tasks/main.yml

@@ -1,7 +1,7 @@
 - name: Directory where OCI private key will be stored
   ansible.builtin.set_fact:
     oci_private_key_path_ci_machine: "{{ hostvars[ci_machine].ansible_user_dir }}/.oci/{{ oci_private_key_path | basename }}"
-    custom_manifests_dir: "{{ hostvars[ci_machine].ansible_user_dir }}/custom_manifests"
+    oci_ci_machine_public_ip: "{{ hostvars[ci_machine].ansible_host }}"
 
 - name: Create directory where OCI private key will be stored on CI machine
   ansible.builtin.file:
@@ -17,14 +17,24 @@
     mode: '0600'
   delegate_to: "{{ ci_machine }}"
 
+- name: Create directory where OCI infrastructure archive will be stored on CI machine
+  ansible.builtin.file:
+    path: "{{ oci_infrastructure_zip_file | dirname }}"
+    state: directory
+    mode: '0700'
+  delegate_to: "{{ ci_machine }}"
+
+- name: Download terraform template to create the infrastructure on OCI
+  ansible.builtin.get_url:
+    url: "{{ oci_infrastructure_zip_url }}"
+    dest: "{{ oci_infrastructure_zip_file }}"
+    mode: '0600'
+  delegate_to: "{{ ci_machine }}"
+
 - name: Export OCI configuration in assisted-additional-config to shared_dir
   ansible.builtin.template:
     src: "assisted-additional-config.j2"
     dest: "{{ shared_dir }}/assisted-additional-config"
-    mode: 0644
+    mode: '0644'
   when: shared_dir is defined
 
-- name: Create OCI custom manifests
-  ansible.builtin.import_tasks:
-    file: custom_manifests.yml
-  delegate_to: "{{ ci_machine }}"

ansible_files/roles/oci/setup_oci_for_test_infra/templates/assisted-additional-config.j2

@@ -9,20 +9,13 @@ export OCI_PRIVATE_KEY_PATH="{{ oci_private_key_path_ci_machine }}"
 export OCI_PUBLIC_KEY_FINGERPRINT="{{ oci_fingerprint }}"
 export OCI_TENANCY="{{ oci_tenancy_id }}"
 export OCI_REGION="{{ oci_region }}"
-export OCI_VCN="{{ infra.oci_vcn_id }}"
-export OCI_PUBLIC_SUBNET="{{ infra.oci_public_subnet_id }}"
-export OCI_PRIVATE_SUBNET="{{ infra.oci_private_subnet_id }}"
 
-# CI machine to access nodes (connect on them through SSH)
-# Nodes to access CI machine (assisted-service API through HTTP/HTTPS)
-export OCI_EXTRA_NODE_NSG_IDS="{{ infra.oci_ci_machine_access_nsg_id }},{{ infra.oci_cluster_ci_nsg_id }}"
+export OCI_INFRASTRUCTURE_ZIP_FILE="{{ oci_infrastructure_zip_file }}"
+export OCI_COMPUTE_SHAPE="{{ oci_compute_shape }}"
+export OCI_CONTROL_PLANE_SHAPE="{{ oci_control_plane_shape }}"
 
-# CI machine to access load balancer (cluster access through HTTP/HTTPS/MCS/API)
-export OCI_EXTRA_LOAD_BALANCER_NSG_IDS="{{ infra.oci_load_balancer_ci_nsg_id }}"
-
-export BASE_DOMAIN="{{ oci_dns_zone }}"
-
-export CUSTOM_MANIFESTS_FILES="{{ custom_manifests_dir }}"
+export BASE_DOMAIN="{{ unique_id }}.{{ oci_dns_zone }}"
+export SERVICE_URL="{{ oci_ci_machine_public_ip }}"
 
 export HOST_INSTALLER_ARGS='{"args": ["--append-karg", "console=ttyS0"]}'
 export KERNEL_ARGUMENTS='[{"operation": "append", "value": "console=ttyS0"}]'