Merge "Rename gating test site"

manifests/function/ephemeral/kustomization.yaml

@@ -1,3 +1,2 @@
 resources:
   - secret.yaml
-  - baremetal.yaml

manifests/function/ephemeral/secret.yaml

@@ -108,53 +108,3 @@ stringData:
     - mount --bind /mnt/vda/var/lib/docker /var/lib/docker
     - mkdir -p /var/lib/docker-engine /mnt/vda/var/lib/docker-engine
     - mount --bind /mnt/vda/var/lib/docker-engine /var/lib/docker-engine
----
-apiVersion: v1
-kind: Secret
-metadata:
-  labels:
-    airshipit.org/deploy-k8s: "false"
-  name: ephemeral-network-data
-  namespace: default
-type: Opaque
-stringData:
-  networkData: |
-    links:
-      - id: enp0s3
-        name: enp0s3
-        type: phy
-        mtu: "1500"
-      - id: enp0s4
-        name: enp0s4
-        type: phy
-        mtu: "1500"
-    networks:
-      - id: private-ipv4
-        type: ipv4
-        link: enp0s3
-        ip_address: 10.23.25.101
-        netmask: 255.255.255.0
-        routes:
-          - network: 0.0.0.0
-            netmask: 0.0.0.0
-            gateway: 10.23.25.1
-      - id: private-ipv4
-        type: ipv4
-        link: enp0s4
-        ip_address: 10.23.24.101
-        netmask: 255.255.255.0
-    services:
-      - address: 8.8.8.8
-        type: dns
-      - address: 8.8.4.4
-        type: dns
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: master-0-bmc-secret
-  namespace: default
-type: Opaque
-stringData:
-  username: ""
-  password: ""

manifests/site/test-bootstrap/ephemeral/bootstrap/kustomization.yaml

@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - ../../../../type/test-bootstrap
-patchesStrategicMerge:
-  - patch-baremetal-host.yaml
-  - patch-baremetal-secret.yaml

manifests/site/test-bootstrap/ephemeral/bootstrap/patch-baremetal-host.yaml

@@ -1,7 +0,0 @@
-apiVersion: metal3.io/v1alpha1
-kind: BareMetalHost
-metadata:
-  name: master-0
-spec:
-  bmc:
-    address: redfish+https://localhost:8443/redfish/v1/Systems/air-ephemeral

manifests/site/test-bootstrap/ephemeral/bootstrap/patch-baremetal-secret.yaml

@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: master-0-bmc-secret
-stringData:
-  username: username
-  password: password

manifests/site/test-site/ephemeral/bootstrap/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ../../shared/baremetalhost/node02
+  - ../../../../type/gating

manifests/site/test-site/shared/baremetalhost/node02/baremetalhost.yaml

@@ -5,16 +5,16 @@ metadata:
   labels:
     airshipit.org/ephemeral-node: "true"
     airshipit.org/deploy-k8s: "false"
-  name: master-0
+  name: node02
 spec:
   online: true
   bootMACAddress: 00:3b:8b:0c:ec:8b
   networkData:
-    name: ephemeral-network-data
+    name: node02-network-data
     namespace: default
   bmc:
-    address: redfish+http://localhost:8000/redfish/v1/Systems/air-ephemeral
-    credentialsName: master-0-bmc-secret
+    address: redfish+https://localhost:8443/redfish/v1/Systems/air-ephemeral
+    credentialsName: node02-bmc-secret
 status:
   provisioning:
 # we need this status to make sure, that the host is not going to be

manifests/site/test-site/shared/baremetalhost/node02/kustomization.yaml

@@ -0,0 +1,16 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - baremetalhost.yaml
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+secretGenerator:
+  - name: node02-network-data
+    files:
+      - networkData
+  - name: node02-bmc-secret
+    literals:
+      - username=username
+      - password=password

manifests/site/test-site/shared/baremetalhost/node02/networkData

@@ -0,0 +1,29 @@
+links:
+  - id: enp0s3
+    name: enp0s3
+    type: phy
+    mtu: "1500"
+  - id: enp0s4
+    name: enp0s4
+    type: phy
+    mtu: "1500"
+networks:
+  - id: private-ipv4
+    type: ipv4
+    link: enp0s3
+    ip_address: 10.23.25.101
+    netmask: 255.255.255.0
+    routes:
+      - network: 0.0.0.0
+        netmask: 0.0.0.0
+        gateway: 10.23.25.1
+  - id: private-ipv4
+    type: ipv4
+    link: enp0s4
+    ip_address: 10.23.24.101
+    netmask: 255.255.255.0
+services:
+  - address: 8.8.8.8
+    type: dns
+  - address: 8.8.4.4
+    type: dns

roles/airshipctl-test-configs/defaults/main.yaml

@@ -18,7 +18,7 @@ airship_config_iso_builder_docker_image: quay.io/airshipit/isogen:latest
 airship_config_iso_port: 8099
 airship_config_iso_serve_host: localhost
 airship_config_iso_name: debian-custom.iso
-airship_site_name: manifests/site/test-bootstrap
+airship_site_name: manifests/site/test-site
 remote_type: redfish
 remote_insecure: true
 remote_proxy: false

roles/airshipctl-test-configs/templates/airshipconfig.j2

@@ -45,7 +45,7 @@ manifests:
           tag: ""
         url: {{ airship_config_primary_repo_url }}
     ## this is temporary hack, as soon as we use `document pull` command in gate process
-    ## this will subpath will be airshipctl/manifests/site/test-bootstrap, as airshipctl
+    ## this will subpath will be airshipctl/manifests/site/test-site, as airshipctl
     ## will be primary repository
     subPath: {{ airship_site_name }}
     targetPath: {{ airship_config_manifest_directory }}

tools/gate/config_template.yaml

@@ -15,7 +15,7 @@ serve_dir: /srv/iso
 serve_port: 8099
 local_src_dir: "$AIRSHIPCTL_WS"
 ansible_user: root
-site_name: test-bootstrap
+site_name: test-site
 remote_work_dir: "$AIRSHIPCTL_WS"
 sphinx_build_dir: docs/build
 python_version: 3.7

zuul.d/jobs.yaml

@@ -75,7 +75,7 @@
     run: playbooks/airship-airshipctl-test-runner.yaml
     nodeset: airship-airshipctl-single-16GB-bionic-node
     vars:
-      site_name: test-bootstrap
+      site_name: test-site
 ## var files are the files that are located at playbooks/vars directory
       var_files:
         - airship-ipam.yaml
@@ -100,7 +100,7 @@
     run: playbooks/airship-airshipctl-test-runner.yaml
     timeout: 3600
     vars:
-      site_name: test-bootstrap
+      site_name: test-site
       var_files:
         - airship-ipam.yaml
         - test-config.yaml