Merge "ansible-microshift-role - use last master and deactivate cento…

…s based jobs"
softwarefactory-project · Jan 24, 2025 · c66f233 · c66f233
2 parents 52362e5 + 4ad85ef
commit c66f233
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 52 deletions.
diff --git a/cli/cmd/dev/microshift/static/all.yaml.tmpl b/cli/cmd/dev/microshift/static/all.yaml.tmpl
@@ -5,12 +5,12 @@ sf_fqdn: {{ .FQDN }}
 
 # The following variables will be used to check out the ansible-microshift-role role at a pinned version
 microshift_role_path: "{{ .MicroshiftRolePath }}"
-microshift_role_version: 6d8be500b4d434b9d98564e0f0a4d8739a328fce
+microshift_role_version: b48b04b96c1e819da28e535cc289ed25c81b2591
 
 # The following variables are used when the ansible-microshift-role role is called
 disk_file_sparsed: true
 disk_file_size: {{ .DiskFileSize }}
-etcd_on_ramdisk: {{ .ETCDOnRAMDisk }}
+ramdisk: {{ .ETCDOnRAMDisk }}
 ramdisk_size: {{ .RAMDiskSize }}
 setup_olm: true
 microshift_additional_addresses:

diff --git a/roles/setup-env/tasks/main.yaml b/roles/setup-env/tasks/main.yaml
@@ -8,19 +8,6 @@
         name: "*"
         state: latest
 
-    - name: Get microshift bits for CentOS
-      block:
-        - ansible.builtin.include_tasks:
-            file: clone-microshift-role.yaml
-
-        - name: Install microshift repos
-          ansible.builtin.include_role:
-            name: "{{ microshift_role_path }}"
-            tasks_from: repo
-      when:
-        - ansible_distribution == "CentOS"
-        - os_host != 'controller'
-
     - name: Check if kubeconfig exists
       ansible.builtin.stat:
         path: ~/.kube/config
@@ -32,11 +19,6 @@
       when: _kubeconfig.stat.exists
       become: false
 
-    - name: Install epel to get git-review
-      ansible.builtin.package:
-        name: epel-release
-      when: ansible_distribution == "CentOS"
-
     - name: Install packages
       ansible.builtin.package:
         name:
@@ -50,25 +32,11 @@
           - zip
           - unzip
 
-    - name: Install openshift-client
-      ansible.builtin.package:
-        name:
-          - openshift-clients
-        enablerepo: microshift-deps-rpms
-      when: ansible_distribution == "CentOS"
-
-    - name: Install kubernetes-client and python3
-      ansible.builtin.package:
-        name:
-          - kubernetes-client
-      when: ansible_distribution == "Fedora"
-
     # NOTE: Tasks are required on multinode-deployment to get kubectl binary
     # NOTE: The command needs to be executed via shell/command module
     # not rhsm_repository modue, because it will raise an error on
     # Centos deployment.
-    - name: Install openshift-client when RHEL
-      when: ansible_distribution | lower == 'redhat'
+    - name: Install openshift-client
       block:
         - name: Enable RHOCP subscription using command
           become: true
@@ -99,7 +67,6 @@
 # ERROR on `go build` for sf-operator:
 # go: go.mod requires go >= 1.22.0 (running go 1.21.13; GOTOOLCHAIN=local)
 - name: Configure TEMPORARY solution for Golang 1.22
-  when: ansible_distribution | lower == 'redhat'
   block:
     - name: Check golang version
       ansible.builtin.package_facts:

diff --git a/tools/microshift/group_vars/all.yaml b/tools/microshift/group_vars/all.yaml
@@ -3,7 +3,6 @@ microshift_ip: "{{ hostvars.microshift.ansible_host }}"
 microshift_fqdn: microshift.dev
 sf_fqdn: sfop.me
 disk_file_sparsed: true
-standard_user: false
 create_pv: false
 disk_file_size: 30G
 setup_olm: true

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -25,7 +25,6 @@
       # microshift deployment
       disk_file_sparsed: true
       disk_file_size: 40G
-      standard_user: false
       create_pv: false
       setup_olm: true
       # post tasks artifacts directory
@@ -34,14 +33,10 @@
       microshift_additional_addresses:
         - "sfop.me"
         - "microshift.dev"
-      etcd_on_ramdisk: true
+      ramdisk: true
       ramdisk_size: 1g
-      cloudprovider_dns:
-        - 199.204.44.24
-        - 199.204.47.54
       inject_dev_ssh_keys: true
 
-
 - job:
     name: sf-operator-rhel
     parent: sf-operator-microshift-rhel

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
@@ -2,19 +2,13 @@
     check:
       jobs:
         - sf-operator-vuln-check
-        - sf-operator-olm
-        - sf-operator-upgrade
-        - sf-operator-standalone
         - sf-operator-ansible-lint
         - sf-operator-olm-rhel
         - sf-operator-upgrade-rhel
         - sf-operator-standalone-rhel
     gate:
       jobs:
         - sf-operator-vuln-check
-        - sf-operator-olm
-        - sf-operator-upgrade
-        - sf-operator-standalone
         - sf-operator-ansible-lint
         - sf-operator-olm-rhel
         - sf-operator-upgrade-rhel
@@ -24,6 +18,6 @@
         - sf-operator-publish-olm-bundle-image
     periodic:
       jobs:
-        - sf-operator-olm
-        - sf-operator-upgrade
-        - sf-operator-standalone
+        - sf-operator-olm-rhel
+        - sf-operator-upgrade-rhel
+        - sf-operator-standalone-rhel