Fix helm test upgrade support for gitlab runner

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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.2] - 2022-10-25
+### Fixed
+- Modified Cypress test to handle upgrades appropriately
+### Changed
+- Moved `bbtests` values into the main `chart/values.yaml` to reduce duplication at BB level
+
 ## [0.45.0-bb.1] - 2022-10-11
 ### Updated
 - Correct Iron Bank image version

README.md

 # gitlab-runner
 
-![Version: 0.45.0-bb.1](https://img.shields.io/badge/Version-0.45.0--bb.1-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.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)
 
 GitLab Runner
 
@@ -95,6 +95,19 @@ helm install gitlab-runner chart/
 | volumeMounts | list | `[]` |  |
 | volumes | list | `[]` |  |
 | monitoring.enabled | bool | `false` |  |
+| bbtests.enabled | bool | `false` |  |
+| bbtests.cypress.artifacts | bool | `true` |  |
+| bbtests.cypress.envs.cypress_baseUrl | string | `"http://gitlab-webservice-default.gitlab.svc.cluster.local:8181"` |  |
+| bbtests.cypress.envs.cypress_gitlab_first_name | string | `"testrunner"` |  |
+| bbtests.cypress.envs.cypress_gitlab_last_name | string | `"userrunner"` |  |
+| bbtests.cypress.envs.cypress_gitlab_username | string | `"gitlabrunner_user"` |  |
+| bbtests.cypress.envs.cypress_gitlab_password | string | `"gitlabrunner_pass"` |  |
+| bbtests.cypress.envs.cypress_gitlab_email | string | `"gitlab@bigbang.dev"` |  |
+| bbtests.cypress.envs.cypress_gitlab_project | string | `"runner-hello-world"` |  |
+| bbtests.cypress.secretEnvs[0].name | string | `"cypress_adminpassword"` |  |
+| bbtests.cypress.secretEnvs[0].valueFrom.secretKeyRef.name | string | `"gitlab-gitlab-initial-root-password"` |  |
+| bbtests.cypress.secretEnvs[0].valueFrom.secretKeyRef.key | string | `"password"` |  |
+| networkPolicies.enabled | bool | `false` |  |
 
 ## Contributing
 

chart/Chart.yaml

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

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

@@ -23,8 +23,8 @@ describe('Run Pipeline', () => {
       if ($body.find('table[data-qa-selector="file_tree_table"]').length > 0) {
         // pipeline already configured. delete the existing pipeline
         cy.visit('/'+Cypress.env('gitlab_username')+'/'+Cypress.env('gitlab_project')+'/-/pipelines')
-        cy.get('a[id="js-code-quality-walkthrough"]').click()
-        cy.get('button[data-qa-selector="job_action_button"]').should('have.class', 'retry').click()
+        cy.get('a[data-qa-selector="pipeline_commit_status"]').click()
+        cy.get('button[data-testid="ci-action-component"]').first().click()
       }
       else {
         // configure new pipeline

chart/values.yaml

@@ -741,3 +741,25 @@ volumes: []
 ## BigBang Specific Values
 monitoring:
   enabled: false
+
+bbtests:
+  enabled: false
+  cypress:
+    artifacts: true
+    envs:
+      cypress_baseUrl: http://gitlab-webservice-default.gitlab.svc.cluster.local:8181
+      cypress_gitlab_first_name: "testrunner"
+      cypress_gitlab_last_name: "userrunner"
+      cypress_gitlab_username: "gitlabrunner_user"
+      cypress_gitlab_password: "gitlabrunner_pass"
+      cypress_gitlab_email: "gitlab@bigbang.dev"
+      cypress_gitlab_project: "runner-hello-world"
+    secretEnvs:
+      - name: cypress_adminpassword
+        valueFrom:
+          secretKeyRef:
+            name: gitlab-gitlab-initial-root-password
+            key: password
+
+networkPolicies:
+  enabled: false

docs/DEVELOPMENT_MAINTENANCE.md

 # How to upgrade the Gitlab Runner Package chart
 BigBang makes modifications to the upstream helm chart. The full list of changes is at the end of  this document.
-1. Rennovate may have aleady made changes in the development branch. If that is the case then just verify that the changes are correct as you go through these steps.
+1. Renovate may have already made changes in the development branch. If that is the case then just verify that the changes are correct as you go through these steps.
 1. Discover the chart version tag that matches with the application version from the [upstream chart](https://gitlab.com/gitlab-org/charts/gitlab-runner) by looking at the Chart.yaml. Do diff between old and new release tags to become aware of any significant chart changes. A graphical diff tool such as [Meld](https://meldmerge.org/) is useful. You can see where the current helm chart came from by inspecting ```/chart/kptfile```
 1. Read the /CHANGELOG.md from the release tag from upstream [upstream chart](https://gitlab.com/gitlab-org/charts/gitlab-runner). Also, be aware of changes in the Gitlab chart that could affect the runner chart. Take note of any special upgrade instructions, if any.
-1. If Rennovate has not created a development branch and merge request then manually create them.
+1. If Renovate has not created a development branch and merge request then manually create them.
 1. Merge/Sync the new helm chart with the existing Gitlab Runner package code. A graphical diff tool like [Meld](https://meldmerge.org/) is useful. Reference the "Modifications made to upstream chart" section below. Be careful not to overwrite Big Bang Package changes that need to be kept. Note that some files will have combinations of changes that you will overwrite and changes that you keep. Stay alert. The hardest file to update is the ```/chart/values.yaml``` because many defaults are changed.
-1. Look in ```/chart/Chart.yaml``` at the dependencies and verify that you have the most recent version of the [Bigbang Gluon](https://repo1.dso.mil/platform-one/big-bang/apps/library-charts/gluon/-/tags) library. If not, delete the ```/chart/charts/gluon-x.x.x.tgz``` file and the ```/requirements.lock``` file. You will replace these files in the next step.
+1. Look in ```/chart/Chart.yaml``` at the dependencies and verify that you have the most recent version of the [Big Bang Gluon](https://repo1.dso.mil/platform-one/big-bang/apps/library-charts/gluon/-/tags) library. If not, delete the ```/chart/charts/gluon-x.x.x.tgz``` file and the ```/requirements.lock``` file. You will replace these files in the next step.
 1. Run a helm dependency command to update the chart/charts/*.tgz archives and create a new requirements.lock file. You will commit the tar archives along with the requirements.lock that was generated.
     ```bash
     export HELM_EXPERIMENTAL_OCI=1
@@ -29,7 +29,7 @@ BigBang makes modifications to the upstream helm chart. The full list of changes
         repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
     ```
 1. Use a development environment to deploy and test Gitlab Runner. See more detailed testing instructions in [Gitlab Package documentation](https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab/-/blob/main/docs/DEVELOPMENT_MAINTENANCE.md). Test with Gitlab Package enabled to make sure the new gitlab-runner version still works with Gitlab. Also test an upgrade by deploying the old version first and then deploying the new version. Verify that the upgrade goes smoothly.
-1. When the Package pipeline runs expect the cypress tests to fail due to UI changes. Note that most of the cypress test files are synced from the [Gitlab Package](https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab/-/tree/main/chart/tests/cypress) to avoid having two different versions of the same tests. Gitlab-runner has a fifth `05` test that the Gitlab package does not have. If you sync the first 4 cypress tests from Gitlab you sholud not have any trouble. See the [Gitlab Package documentation](https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab/-/blob/main/docs/DEVELOPMENT_MAINTENANCE.md) if you do need to run the cypress tests locally.
+1. When the Package pipeline runs expect the cypress tests to fail due to UI changes. Note that most of the cypress test files are synced from the [Gitlab Package](https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab/-/tree/main/chart/tests/cypress) to avoid having two different versions of the same tests. Gitlab-runner has a fifth `05` test that the Gitlab package does not have. If you sync the first 4 cypress tests from Gitlab you should not have any trouble. See the [Gitlab Package documentation](https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab/-/blob/main/docs/DEVELOPMENT_MAINTENANCE.md) if you do need to run the cypress tests locally. This test should be able to pass on BOTH clean install and upgrade stages with the appropriate updates.
 1. Update the /README.md again if you have made any additional changes during the upgrade/testing process.
 
 
@@ -97,4 +97,7 @@ This is a high-level list of modifications that Big Bang has made to the upstrea
 - repository: independently customize repository
 - tag: independently customize tag
 - runners.job: independently customize UBI image details
-- runners.helper: independently customize Gitlab Runner Helper image details
\ No newline at end of file
+- runners.helper: independently customize Gitlab Runner Helper image details
+- monitoring.enabled: value added to support BB monitoring
+- bbtests: values added to support CI testing with gluon
+- networkPolicies.enabled: value added to support NPs (for CI testing only)

tests/test-values.yml

@@ -11,19 +11,3 @@ networkPolicies:
 # Cypress testing values
 bbtests:
   enabled: true
-  cypress:
-    artifacts: true
-    envs:
-      cypress_baseUrl: http://gitlab-webservice-default.gitlab.svc.cluster.local:8181
-      cypress_gitlab_first_name: "testrunner"
-      cypress_gitlab_last_name: "userrunner"
-      cypress_gitlab_username: "gitlabrunner_user"
-      cypress_gitlab_password: "gitlabrunner_pass"
-      cypress_gitlab_email: "gitlab@bigbang.dev"
-      cypress_gitlab_project: "runner-hello-world"
-    secretEnvs:
-      - name: cypress_adminpassword
-        valueFrom:
-          secretKeyRef:
-            name: gitlab-gitlab-initial-root-password
-            key: password