SKIP UPGRADE Update dependency registry1.dso.mil/ironbank/redhat/ubi/ubi8 to v8.7

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.45.0-bb.3] - 2022-11-21
+### Changed
+- UBI image update to `8.7`
+- updated `renovate.json` to sync `appVersion` from ironbank
+
 ## [0.45.0-bb.2] - 2022-10-25
 ### Fixed
 - Modified Cypress test to handle upgrades appropriately

README.md

 # gitlab-runner
 
-![Version: 0.45.0-bb.2](https://img.shields.io/badge/Version-0.45.0--bb.2-informational?style=flat-square) ![AppVersion: 15.4.0](https://img.shields.io/badge/AppVersion-15.4.0-informational?style=flat-square)
+![Version: 0.45.0-bb.3](https://img.shields.io/badge/Version-0.45.0--bb.3-informational?style=flat-square) ![AppVersion: 15.4.0](https://img.shields.io/badge/AppVersion-15.4.0-informational?style=flat-square)
 
 GitLab Runner
 
@@ -58,7 +58,7 @@ helm install gitlab-runner chart/
 | service.type | string | `"ClusterIP"` |  |
 | runners.job.registry | string | `"registry1.dso.mil"` |  |
 | runners.job.repository | string | `"ironbank/redhat/ubi/ubi8"` |  |
-| runners.job.tag | string | `"8.6"` |  |
+| runners.job.tag | string | `"8.7"` |  |
 | runners.helper.registry | string | `"registry1.dso.mil"` |  |
 | runners.helper.repository | string | `"ironbank/gitlab/gitlab-runner/gitlab-runner-helper"` |  |
 | runners.helper.tag | string | `"v15.4.0"` |  |

chart/Chart.yaml

 apiVersion: v1
 name: gitlab-runner
-version: 0.45.0-bb.2
+version: 0.45.0-bb.3
 appVersion: 15.4.0
 description: GitLab Runner
 keywords:

chart/tests/cypress/02-gitlab-signup.spec.js

-Cypress.on('uncaught:exception', (err, runnable) => {
-  // returning false here prevents Cypress from
-  // failing the test
-  if (err.message.includes('Cannot read')) {
-    return false
-  }  
-})
-
 describe('Gitlab Signup', () => {
   it('Check user is able to signup', () => {
     // test signup
     cy.visit('/users/sign_up')
 
+    // /users/sign_up is throwing an uncaught exception - we can continue the test by ignoring this single error
+    cy.on('uncaught:exception', (err, runnable) => {
+      expect(err.message).to.include('Cannot read')
+
+      return false
+    })
+
     cy.get('input[id="new_user_first_name"]').type(Cypress.env('gitlab_first_name'))
     cy.get('input[id="new_user_last_name"]').type(Cypress.env('gitlab_last_name'))
     cy.get('input[id="new_user_username"]').type(Cypress.env('gitlab_username'))

chart/tests/cypress/03-gitlab-login.spec.js

 Cypress.on('uncaught:exception', (err, runnable) => {
   // returning false here prevents Cypress from
   // failing the test
-  if (err.message.includes('Cannot read')) {
+  if (err.message.includes('Cannot read properties of null')) {
     return false
   }  
 })
@@ -19,14 +19,19 @@ describe('Gitlab Login', () => {
     cy.get('a[data-qa-selector="pending_approval_tab"]').click()
 
     cy.get('body').then($body => {
-      if ($body.find('button[id="__BVID__65__BV_toggle_"]').length > 0 ) {
+      if ($body.find('button[id="__BVID__55__BV_toggle_"]').length > 0 ) {
         // version 14.8.2
         // cy.get('button[id="__BVID__35__BV_toggle_"]').click()
         // cy.get('button[data-qa-selector="approve_user_button"]').click()
         // cy.get('button[data-qa-selector="approve_user_confirm_button"]').click()
 
         // version 14.9.2
-        cy.get('button[id="__BVID__65__BV_toggle_"]').click()
+        //cy.get('button[id="__BVID__65__BV_toggle_"]').click()
+        //cy.get('button[data-qa-selector="approve_user_button"]').click()
+        //cy.get('button[data-qa-selector="approve_user_confirm_button"]').click()
+
+        // version 15.5.0
+        cy.get('button[id="__BVID__55__BV_toggle_"]').click()
         cy.get('button[data-qa-selector="approve_user_button"]').click()
         cy.get('button[data-qa-selector="approve_user_confirm_button"]').click()
       }

chart/tests/cypress/04-gitlab-create-project.spec.js

@@ -31,9 +31,10 @@ describe('Create Gitlab Project', () => {
             cy.get('input[id="project_name"]').first().type(Cypress.env('gitlab_project')) // for some reason, there are 2 other hidden elements with the same attributes but we only need the first one
             // For some reason, there are 2 other hidden elements with the same attributes but we only need the first one
             // Also use force: true for the click due to the label is covering the radio button (but can still be clicked) 
-            cy.get('input[id="project_visibility_level_20"]').first().click({force: true})     
-            cy.get('input[id="project_initialize_with_readme"]').click({force: true})
-            cy.get('input[type="submit"]').first().click()                        // for some reason, there are 2 other hidden elements with the same attributes but we only need the first one
+            cy.get('input[id="project_visibility_level_20"]').first().click({force: true})  
+            //commenting out below because 'initial_with_readme' is checked by default now
+            //cy.get('input[id="project_initialize_with_readme"]').click({force: true)
+            cy.get('button[type="submit"]').first().click()                        // for some reason, there are 2 other hidden elements with the same attributes but we only need the first one
       }
     })
 

chart/tests/cypress/05-run-pipeline.spec.js

@@ -15,12 +15,12 @@ describe('Run Pipeline', () => {
     // Disable Auto DevOps
     cy.visit('/'+Cypress.env('gitlab_username')+'/'+Cypress.env('gitlab_project')+'/-/settings/ci_cd#autodevops-settings')
     cy.get('input[id="project_auto_devops_attributes_enabled"]').uncheck({force: true})
-    cy.get('input[data-qa-selector="save_changes_button"]').click()
+    cy.get('button[data-qa-selector="save_changes_button"]').click()
 
     // conditionally configure ci pipeline
     cy.visit('/'+Cypress.env('gitlab_username')+'/'+Cypress.env('gitlab_project'))
     cy.get('body').then($body => {
-      if ($body.find('table[data-qa-selector="file_tree_table"]').length > 0) {
+      if ($body.find('table[data-testid="pipelines-tab-all"]').length > 0) {
         // pipeline already configured. delete the existing pipeline
         cy.visit('/'+Cypress.env('gitlab_username')+'/'+Cypress.env('gitlab_project')+'/-/pipelines')
         cy.get('a[data-qa-selector="pipeline_commit_status"]').click()
@@ -30,9 +30,10 @@ describe('Run Pipeline', () => {
         // configure new pipeline
         cy.visit('/'+Cypress.env('gitlab_username')+'/'+Cypress.env('gitlab_project')+'/-/new/main/')
         cy.get('input[id="file_name"]').click().type('.gitlab-ci.yml')
-        cy.get('div[class="view-line"]').click().type('stages:{enter}  - test{enter}{backspace}pipeline-test:{enter}  script:{enter}  - echo The pipeline test is successful!{enter}')
+        cy.get('div[class="view-line"]').click().type('pipeline-test:{enter}{backspace}  stage: test{enter}{backspace}  script:{enter}{backspace}{backspace}    - echo The pipeline test is successful!{enter}')
         // commit file and start pipeline
-        cy.get('button[id="commit-changes"]').click()
+        cy.scrollTo('bottom')
+        cy.get('button[data-qa-selector="commit_button"]').click()
       }
     })
     // wait 9 seconds for pipeline to get started

chart/tests/cypress/cypress.json

 {
   "pluginsFile": false,
   "supportFile": false,
-  "fixturesFolder": false,
-  "chromeWebSecurity": false,
-  "videoCompression": 20
-}
+  "fixturesFolder": false
+}
\ No newline at end of file

chart/values.yaml

@@ -313,7 +313,7 @@ runners:
   job:
     registry: registry1.dso.mil
     repository: ironbank/redhat/ubi/ubi8
-    tag: "8.6"
+    tag: "8.7"
   helper:
     registry: registry1.dso.mil
     repository: ironbank/gitlab/gitlab-runner/gitlab-runner-helper

renovate.json

@@ -44,6 +44,14 @@
       ],
       "depNameTemplate": "ironbank/gitlab/gitlab-runner/gitlab-runner",
       "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": ["^chart/Chart\\.yaml$"],
+      "matchStrings": [
+          "appVersion:[^\\S\\r\\n]+(?<currentValue>.+)"
+      ],
+      "depNameTemplate": "ironbank/gitlab/gitlab-runner/gitlab-runner",
+      "datasourceTemplate": "docker"
     }
   ]
 }

tests/images.txt

 registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v15.4.0
-registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.6
+registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.7