test: Update version of NGINX Plus in Molecule tests (#503)

.github/workflows/molecule.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches: [main]
     tags-ignore: ["**"]
+  merge_group:
   schedule:
     - cron: "0 0 1 * *"
   workflow_dispatch:
@@ -38,6 +39,7 @@ jobs:
     env:
       NGINX_CRT: ${{ secrets.NGINX_CRT }}
       NGINX_KEY: ${{ secrets.NGINX_KEY }}
+      NGINX_JWT: ${{ secrets.NGINX_JWT }}
     strategy:
       fail-fast: false
       matrix:

.gitignore

@@ -1,28 +1,44 @@
-# Any private crt and keys #
-############################
+########################
+# Any crt/keys/license #
+########################
 *.crt
 *.key
-*~
-\#*
+*.jwt
 !molecule.crt
 !molecule.key
 !rand.key
 
-# OS Specific #
-###############
+##########################
+# Backup/temporary files #
+##########################
+*~
+\#*
+
+##################
+# MacOS specific #
+##################
 Thumbs.db
 .DS_Store
 .vscode
 
+########################
+# Code editor specific #
+########################
+.idea
+.vscode
+
+####################
 # Ansible specific #
 ####################
 .cache
 *.retry
 
+###################
 # Python specific #
 ###################
 __pycache__
 
+########
 # Logs #
 ########
 *.log

CHANGELOG.md

@@ -20,6 +20,7 @@ TESTS:
 - Update the platforms used in the various Molecule scenarios.
 - Use the local role name (`ansible-role-nginx-config`) instead of the fully qualified role name (`nginxinc.nginx_config`) in Molecule to ensure tests always work as intended in environments where the role has been already installed beforehand.
 - Update RHEL UBI images to UBI 9.4.
+- Update Molecule NGINX Plus tests to work with R33 by introducing the new license JWT.
 
 DOCUMENTATION:
 

molecule/api_plus/prepare.yml

@@ -17,6 +17,13 @@
         force: false
         mode: "0444"
 
+    - name: Create ephemeral license JWT file from b64 encoded env var
+      ansible.builtin.copy:
+        content: "{{ lookup('env', 'NGINX_JWT') }}"
+        dest: ../common/files/license/license.jwt
+        force: false
+        mode: "0444"
+
 - name: Install NGINX Plus
   hosts: all
   tasks:
@@ -28,4 +35,5 @@
         nginx_license:
           certificate: ../common/files/license/nginx-repo.crt
           key: ../common/files/license/nginx-repo.key
+          jwt: ../common/files/license/license.jwt
         nginx_remove_license: false

molecule/common/requirements/oss_requirements.yml

@@ -1,4 +1,4 @@
 ---
 roles:
   - name: nginxinc.nginx
-    version: 0.24.3
+    version: 0.25.0

molecule/common/requirements/plus_requirements.yml

@@ -1,7 +1,7 @@
 ---
 roles:
   - name: nginxinc.nginx
-    version: 0.24.3
-  - name: nginxinc.nginx_app_protect
-    src: https://github.com/nginxinc/ansible-role-nginx-app-protect
-    version: main
+    version: 0.25.0
+  # - name: nginxinc.nginx_app_protect
+  #   src: https://github.com/nginxinc/ansible-role-nginx-app-protect
+  #   version: main

molecule/complete_plus/prepare.yml

@@ -17,6 +17,13 @@
         force: false
         mode: "0444"
 
+    - name: Create ephemeral license JWT file from b64 encoded env var
+      ansible.builtin.copy:
+        content: "{{ lookup('env', 'NGINX_JWT') }}"
+        dest: ../common/files/license/license.jwt
+        force: false
+        mode: "0444"
+
 - name: Install NGINX Plus
   hosts: all
   tasks:
@@ -28,6 +35,7 @@
         nginx_license:
           certificate: ../common/files/license/nginx-repo.crt
           key: ../common/files/license/nginx-repo.key
+          jwt: ../common/files/license/license.jwt
         nginx_remove_license: false
 
     # - name: Install NGINX App Protect WAF