Remove ones-22 config (nephio-project#246)

* Remove ones-22 config * Fix prow job config * Remove nephio.yaml from terraform
Nordix · Feb 12, 2024 · fb1c08d · fb1c08d
1 parent 0ae6929
commit fb1c08d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 90 deletions.
diff --git a/.prow.yaml b/.prow.yaml
@@ -141,8 +141,6 @@ presubmits:
               mountPath: "/etc/satoken"
             - name: ssh-key-vol
               mountPath: "/etc/ssh-key"
-            - name: nephio-e2e-yaml
-              mountPath: "/etc/nephio"
           resources:
             requests:
               cpu: 2
@@ -163,12 +161,6 @@ presubmits:
                 path: id_rsa
               - key: id_rsa.pub
                 path: id_rsa.pub
-        - name: nephio-e2e-yaml
-          secret:
-            secretName: nephio-e2e-yaml
-            items:
-              - key: nephio.yaml
-                path: nephio.yaml
   - name: e2e-free5gc-fedora-34
     annotations:
     labels:
@@ -192,8 +184,6 @@ presubmits:
               mountPath: "/etc/satoken"
             - name: ssh-key-vol
               mountPath: "/etc/ssh-key"
-            - name: nephio-e2e-yaml
-              mountPath: "/etc/nephio"
           resources:
             requests:
               cpu: 2
@@ -214,12 +204,6 @@ presubmits:
                 path: id_rsa
               - key: id_rsa.pub
                 path: id_rsa.pub
-        - name: nephio-e2e-yaml
-          secret:
-            secretName: nephio-e2e-yaml
-            items:
-              - key: nephio.yaml
-                path: nephio.yaml
   - name: e2e-oai-ubuntu-jammy
     annotations:
     labels:
@@ -242,8 +226,6 @@ presubmits:
               mountPath: "/etc/satoken"
             - name: ssh-key-vol
               mountPath: "/etc/ssh-key"
-            - name: nephio-e2e-yaml
-              mountPath: "/etc/nephio"
           resources:
             requests:
               cpu: 2
@@ -264,13 +246,6 @@ presubmits:
                 path: id_rsa
               - key: id_rsa.pub
                 path: id_rsa.pub
-        - name: nephio-e2e-yaml
-          secret:
-            secretName: nephio-e2e-yaml
-            items:
-              - key: nephio.yaml
-                path: nephio.yaml
-
 postsubmits:
   - name: build-push-image-gotests
     cluster: default

diff --git a/e2e/README.md b/e2e/README.md
@@ -11,8 +11,3 @@ And make k8s secret out of it:
 ```
 kubectl create secret generic ssh-key-e2e --from-file=id_rsa=/home/your_user/.ssh/gce_prow_lab --from-file=id_rsa.pub=/home/your_user/.ssh/gce_prow_lab.pub -n test-pods
 ```
-
-Populate nephio.yaml with your settings, create dockerhub read-only token and place it in prow.yaml, then make secret out of it. It will be mounted and copied over to destination machine under one-summit-22-workshop/nephio-ansible-install/inventory/
-```
-kubectl create secret generic nephio-e2e-yaml --from-file=nephio.yaml=/Users/user/dev/nephio/repos_fork/nephio.yaml -n test-pods
-```
diff --git a/e2e/provision/init.sh b/e2e/provision/init.sh
@@ -107,8 +107,6 @@ find "$REPO_DIR" -name '*.sh' -exec chmod +x {} \;
 cp "$REPO_DIR/e2e/provision/bash_config.sh" "$HOME/.bash_aliases"
 chown "$NEPHIO_USER:$NEPHIO_USER" "$HOME/.bash_aliases"
 
-sed -e "s/vagrant/$NEPHIO_USER/" <"$REPO_DIR/e2e/provision/nephio.yaml" >"$HOME/nephio.yaml"
-
 # Sandbox Creation
 int_start=$(date +%s)
 cd "$REPO_DIR/e2e/provision"

diff --git a/e2e/provision/install_sandbox.sh b/e2e/provision/install_sandbox.sh
@@ -74,28 +74,14 @@ fact_caching = jsonfile
 fact_caching_connection = /tmp
 EOT
 
-if [ "${DEPLOYMENT_TYPE:-r1}" == "one-summit" ]; then
-    [[ -d "$HOME/workshop" ]] || git clone --depth 1 https://github.com/nephio-project/one-summit-22-workshop.git "$HOME/workshop"
-    mkdir -p "$HOME/workshop/nephio-ansible-install/inventory"
-    cp "$HOME/nephio.yaml" "$HOME/workshop/nephio-ansible-install/inventory/"
-    pushd "$HOME/workshop/nephio-ansible-install" >/dev/null
-    for playbook in install-prereq create-gitea create-gitea-repos deploy-clusters configure-nephio; do
-        if [[ ${DEBUG:-false} != "true" ]]; then
-            ansible-playbook "playbooks/$playbook.yaml"
-        else
-            ansible-playbook -vvv "playbooks/$playbook.yaml"
-        fi
-    done
-    popd >/dev/null
-else
-    # Management cluster creation
-    ansible_cmd="$(command -v ansible-playbook) -i 127.0.0.1, playbooks/cluster.yml "
-    [[ ${DEBUG:-false} != "true" ]] || ansible_cmd+="-vvv "
-    if [ -n "${ANSIBLE_CMD_EXTRA_VAR_LIST:-}" ]; then
-        ansible_cmd+=" --extra-vars=\"${ANSIBLE_CMD_EXTRA_VAR_LIST}\""
-    fi
-    echo "$ansible_cmd"
-    eval "$ansible_cmd" | tee ~/cluster.log
+# Management cluster creation
+ansible_cmd="$(command -v ansible-playbook) -i 127.0.0.1, playbooks/cluster.yml "
+[[ ${DEBUG:-false} != "true" ]] || ansible_cmd+="-vvv "
+if [ -n "${ANSIBLE_CMD_EXTRA_VAR_LIST:-}" ]; then
+    ansible_cmd+=" --extra-vars=\"${ANSIBLE_CMD_EXTRA_VAR_LIST}\""
 fi
+echo "$ansible_cmd"
+eval "$ansible_cmd" | tee ~/cluster.log
+
 
 echo "Done installing Nephio Sandbox Environment"
diff --git a/e2e/terraform/modules/gcp/main.tf b/e2e/terraform/modules/gcp/main.tf
@@ -22,7 +22,6 @@ resource "random_string" "vm-name" {
 
 locals {
   vm-name    = "e2e-vm-${random_string.vm-name.result}"
-  nephioyaml = "/home/${var.ansible_user}/nephio.yaml"
 }
 
 resource "google_compute_instance" "lab_instances" {
@@ -78,17 +77,6 @@ resource "google_compute_instance" "e2e_instances" {
       agent       = false
     }
   }
-  provisioner "file" {
-    source      = "/etc/nephio/nephio.yaml"
-    destination = local.nephioyaml
-    connection {
-      host        = self.network_interface[0].access_config[0].nat_ip
-      type        = "ssh"
-      private_key = file(var.ssh_prv_key)
-      user        = var.ansible_user
-      agent       = false
-    }
-  }
   provisioner "remote-exec" {
     connection {
       host        = self.network_interface[0].access_config[0].nat_ip

diff --git a/prow/config/config.yaml b/prow/config/config.yaml
@@ -1434,8 +1434,6 @@ periodics:
               mountPath: "/etc/satoken"
             - name: ssh-key-vol
               mountPath: "/etc/ssh-key"
-            - name: nephio-e2e-yaml
-              mountPath: "/etc/nephio"
           resources:
             requests:
               cpu: 2
@@ -1456,12 +1454,6 @@ periodics:
                 path: id_rsa
               - key: id_rsa.pub
                 path: id_rsa.pub
-        - name: nephio-e2e-yaml
-          secret:
-            secretName: nephio-e2e-yaml
-            items:
-              - key: nephio.yaml
-                path: nephio.yaml
   - name: e2e-daily-fedora-34-free5gc
     annotations:
     labels:
@@ -1489,8 +1481,6 @@ periodics:
               mountPath: "/etc/satoken"
             - name: ssh-key-vol
               mountPath: "/etc/ssh-key"
-            - name: nephio-e2e-yaml
-              mountPath: "/etc/nephio"
           resources:
             requests:
               cpu: 2
@@ -1511,12 +1501,6 @@ periodics:
                 path: id_rsa
               - key: id_rsa.pub
                 path: id_rsa.pub
-        - name: nephio-e2e-yaml
-          secret:
-            secretName: nephio-e2e-yaml
-            items:
-              - key: nephio.yaml
-                path: nephio.yaml
   - name: e2e-daily-ubuntu-jammy-oai
     annotations:
     labels:
@@ -1544,8 +1528,6 @@ periodics:
               mountPath: "/etc/satoken"
             - name: ssh-key-vol
               mountPath: "/etc/ssh-key"
-            - name: nephio-e2e-yaml
-              mountPath: "/etc/nephio"
           resources:
             requests:
               cpu: 2
@@ -1566,9 +1548,3 @@ periodics:
                 path: id_rsa
               - key: id_rsa.pub
                 path: id_rsa.pub
-        - name: nephio-e2e-yaml
-          secret:
-            secretName: nephio-e2e-yaml
-            items:
-              - key: nephio.yaml
-                path: nephio.yaml