Move osbs customization files in the buildroot image

Signed-off-by: Clement Verna <cverna@tutanota.com>

files/osbs/buildroot-Dockerfile-staging.j2

@@ -3,6 +3,8 @@ ADD ./infra-tags.repo /etc/yum.repos.d/infra-tags.repo
 RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-setuptools e2fsprogs koji python-backports-lzma osbs-client\
     python-osbs-client gssproxy fedpkg python-docker-squash atomic-reactor python-atomic-reactor* go-md2man python2-productmd python3-productmd\
     libmodulemd python2-gobject python3-gobject python2-modulemd python3-modulemd python2-pdc-client python3-pdc-client ostree flatpak skopeo
+ADD ./orchestrator_customize.json /usr/share/osbs/orchestrator_customize.json
+ADD ./worker_customize.json /usr/share/osbs/worker_customize.json
 ADD ./krb5.conf /etc
 RUN printf '[libdefaults]\n default_ccache_name = DIR:/tmp/ccache_%%{uid}' >/etc/krb5.conf.d/ccache.conf
 ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/

files/osbs/orchestrator_customize.json

@@ -0,0 +1,11 @@
+{
+    "disable_plugins": [
+        {
+            "plugin_type": "exit_plugins",
+            "plugin_name": "import_image"
+        }
+    ],
+
+    "enable_plugins": [
+    ]
+}

files/osbs/worker_customize.json

@@ -0,0 +1,11 @@
+{
+    "disable_plugins": [
+        {
+            "plugin_type": "prebuild_plugins",
+            "plugin_name": "fetch_maven_artifacts"
+        }
+    ],
+
+    "enable_plugins": [
+    ]
+}

playbooks/groups/osbs-cluster.yml

@@ -880,6 +880,16 @@
       notify:
         - restart and reload docker service
 
+    - name: copy the osbs customization file
+      copy:
+        src: "{{item}}"
+        dest: "/etc/osbs/buildroot/"
+        owner: root
+        mode: 600
+      with_file:
+        - "{{files}}/osbs/worker_customize.json"
+        - "{{files}}/osbs/orchestrator_customize.json"
+
     - name: Create buildroot container conf directory
       file:
         path: "/etc/osbs/buildroot/"

roles/osbs-client/tasks/main.yml

@@ -30,16 +30,6 @@
   - osbs-client
   when: env == 'production'
 
-
-- name: Upload OSBS Orchestrator Customizations plugin conf
-  copy:
-    src: "osbs-orchestrator-customize.json"
-    dest: "/usr/share/osbs/orchestrator_customize.json"
-    mode: 0644
-  tags:
-  - osbs-client
-  when: env == 'staging'
-
 - name: Symlink in OSBS input configs provided by package
   file:
     src: "/usr/share/osbs/{{item}}.json"
@@ -52,8 +42,7 @@
   - osbs-client
   when: env == 'production'
 
-- name: We do not want orchestrator.json in production
+- name: We do not want orchestrator.json on the buildvm
   file: name=/etc/osbs/input/orchestrator.json state=absent
   tags:
-  - osbs-client
-  when: env == 'production'
+  - osbs-client