Merge pull request #14 from ansible-middleware/fix_olympus_ci

Skip staging if creds are not provided.

Author: rpelisse

molecule/prod_eap/converge.yml

@@ -2,11 +2,21 @@
 - name: Converge
   hosts: localhost
   gather_facts: no
+  vars:
+    client_id: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_CLIENTID') }}"
+    client_secret: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_SECRET') }}"
   tasks:
+    - name: "Ensures required secret are provided."
+      ansible.builtin.assert:
+        that:
+          - client_id is defined and client_id | length > 0
+          - client_secret is defined and client_secret | length > 0
+        fail_msg: "Missing required env vars PROD_JBOSSNETWORK_API_CLIENTID and/or PROD_JBOSSNETWORK_API_SECRET"
+
     - name: Search EAP Product
       middleware_automation.common.product_search:
-        client_id: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_CLIENTID') }}"
-        client_secret: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_SECRET') }}"
+        client_id: "{{ client_id }}"
+        client_secret: "{{ client_secret }}"
         product_type: DISTRIBUTION
         product_version: '7.4'
         product_category: appplatform
@@ -19,8 +29,8 @@
 
     - name: Retrieve product download using JBossNetwork API
       middleware_automation.common.product_search:
-        client_id: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_CLIENTID') }}"
-        client_secret: "{{ lookup('env', 'PROD_JBOSSNETWORK_API_SECRET') }}"
+        client_id: "{{ client_id }}"
+        client_secret: "{{ client_secret }}"
         product_type: BUGFIX
         product_version: '7.4'
         product_category: appplatform

molecule/prod_eap/molecule.yml

@@ -17,6 +17,9 @@ provisioner:
       interpreter_python: auto_silent
     ssh_connection:
       pipelining: false
+  env:
+    REDHAT_PRODUCT_DOWNLOAD_CLIENT_ID: "${REDHAT_PRODUCT_DOWNLOAD_CLIENT_ID}"
+    REDHAT_PRODUCT_DOWNLOAD_CLIENT_SECRET: "${REDHAT_PRODUCT_DOWNLOAD_CLIENT_SECRET}"
   playbooks:
     converge: converge.yml
   inventory:

molecule/stage_eap/converge.yml

@@ -2,44 +2,52 @@
 - name: Converge
   hosts: all
   gather_facts: yes
-  tasks:
-    - name: Search EAP Product
-      middleware_automation.common.product_search:
-        api_url: "https://jbossnetwork.stage.api.redhat.com"
-        sso_url: "https://sso.stage.redhat.com"
+  vars:
         client_id: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_CLIENTID') }}"
         client_secret: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_SECRET') }}"
-        product_type: DISTRIBUTION
-        product_version: '7.4'
-        product_category: appplatform
-      register: rhn_products
-      no_log: false
+  tasks:
+    - name: Execute scenario if staging credentials are provided
+      when:
+        - client_id is defined and client_password is defined
+      block:
 
-    - name: Search install zipfile
-      ansible.builtin.set_fact:
-        rhn_filtered_products: "{{ rhn_products.results | selectattr('file_path', 'match', '[^/]*/jboss-eap-7.4.0.zip$') }}"
+        - name: Search EAP Product
+          middleware_automation.common.product_search:
+            api_url: "https://jbossnetwork.stage.api.redhat.com"
+            sso_url: "https://sso.stage.redhat.com"
+            client_id: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_CLIENTID') }}"
+            client_secret: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_SECRET') }}"
+            product_type: DISTRIBUTION
+            product_version: '7.4'
+            product_category: appplatform
+          register: rhn_products
+          no_log: false
 
-    - name: Retrieve product download using JBossNetwork API
-      middleware_automation.common.product_search:
-        api_url: "https://jbossnetwork.stage.api.redhat.com"
-        sso_url: "https://sso.stage.redhat.com"
-        client_id: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_CLIENTID') }}"
-        client_secret: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_SECRET') }}"
-        product_type: BUGFIX
-        product_version: '7.4'
-        product_category: appplatform
-      register: rhn_products
-      no_log: true
-
-    - name: Patch
-      block:
-        - name: Determine patch versions list
+        - name: Search install zipfile
           ansible.builtin.set_fact:
-            filtered_versions: "{{ rhn_products.results | map(attribute='file_path') | select('match', '^[^/]*/jboss-eap-.*[0-9]*[.][0-9]*[.][0-9]*.*$') | map('regex_replace','[^/]*/jboss-eap-([0-9]*[.][0-9]*[.][0-9]*)-.*','\\1' ) | list | unique }}"
-        - name: Determine latest version
-          ansible.builtin.debug:
-            msg: "JBoss EAP 7.4 most recent CP is version {{ filtered_versions | middleware_automation.common.version_sort | last }}"
-      rescue:
-        - name: No patches on staging
-          ansible.builtin.debug:
-            msg: "JBoss EAP 7.4 has no patches"
+            rhn_filtered_products: "{{ rhn_products.results | selectattr('file_path', 'match', '[^/]*/jboss-eap-7.4.0.zip$') }}"
+
+        - name: Retrieve product download using JBossNetwork API
+          middleware_automation.common.product_search:
+            api_url: "https://jbossnetwork.stage.api.redhat.com"
+            sso_url: "https://sso.stage.redhat.com"
+            client_id: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_CLIENTID') }}"
+            client_secret: "{{ lookup('env', 'STAGE_JBOSSNETWORK_API_SECRET') }}"
+            product_type: BUGFIX
+            product_version: '7.4'
+            product_category: appplatform
+          register: rhn_products
+          no_log: true
+
+        - name: Patch
+          block:
+            - name: Determine patch versions list
+              ansible.builtin.set_fact:
+                filtered_versions: "{{ rhn_products.results | map(attribute='file_path') | select('match', '^[^/]*/jboss-eap-.*[0-9]*[.][0-9]*[.][0-9]*.*$') | map('regex_replace','[^/]*/jboss-eap-([0-9]*[.][0-9]*[.][0-9]*)-.*','\\1' ) | list | unique }}"
+            - name: Determine latest version
+              ansible.builtin.debug:
+                msg: "JBoss EAP 7.4 most recent CP is version {{ filtered_versions | middleware_automation.common.version_sort | last }}"
+          rescue:
+            - name: No patches on staging
+              ansible.builtin.debug:
+                msg: "JBoss EAP 7.4 has no patches"