Merge pull request #194 from prietyc123/addGitopsUsernameForBitbucket

[RHTAP-4857] - Add username for azure pipeline variable

Author: lcarva

generated/source-repo/azure/azure-pipelines.yml

@@ -28,6 +28,8 @@ steps:
     name: init
     env:
       ROX_API_TOKEN: $(ROX_API_TOKEN)
+      # Uncomment this when using Bitbucket
+      # GITOPS_AUTH_USERNAME: $(GITOPS_AUTH_USERNAME)
       GITOPS_AUTH_PASSWORD: $(GITOPS_AUTH_PASSWORD)
       # Set this password for your specific registry
       IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
@@ -44,6 +46,8 @@ steps:
     name: build
     env:
       ROX_API_TOKEN: $(ROX_API_TOKEN)
+      # Uncomment this when using Bitbucket
+      # GITOPS_AUTH_USERNAME: $(GITOPS_AUTH_USERNAME)
       GITOPS_AUTH_PASSWORD: $(GITOPS_AUTH_PASSWORD)
       # Set this password for your specific registry
       IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
@@ -58,6 +62,8 @@ steps:
     name: deploy
     env:
       ROX_API_TOKEN: $(ROX_API_TOKEN)
+      # Uncomment this when using Bitbucket
+      # GITOPS_AUTH_USERNAME: $(GITOPS_AUTH_USERNAME)
       GITOPS_AUTH_PASSWORD: $(GITOPS_AUTH_PASSWORD)
       # Set this password for your specific registry
       IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
@@ -76,6 +82,8 @@ steps:
     name: scan
     env:
       ROX_API_TOKEN: $(ROX_API_TOKEN)
+      # Uncomment this when using Bitbucket
+      # GITOPS_AUTH_USERNAME: $(GITOPS_AUTH_USERNAME)
       GITOPS_AUTH_PASSWORD: $(GITOPS_AUTH_PASSWORD)
       # Set this password for your specific registry
       IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)
@@ -92,6 +100,8 @@ steps:
     name: summary
     env:
       ROX_API_TOKEN: $(ROX_API_TOKEN)
+      # Uncomment this when using Bitbucket
+      # GITOPS_AUTH_USERNAME: $(GITOPS_AUTH_USERNAME)
       GITOPS_AUTH_PASSWORD: $(GITOPS_AUTH_PASSWORD)
       # Set this password for your specific registry
       IMAGE_REGISTRY_PASSWORD: $(IMAGE_REGISTRY_PASSWORD)

hack/azure_set_vars.py

@@ -143,6 +143,7 @@ def main() -> None:
     variables_to_set = [
         VarFromEnv("ROX_CENTRAL_ENDPOINT", is_secret=False),
         VarFromEnv("ROX_API_TOKEN"),
+        VarFromEnv("GITOPS_AUTH_USERNAME"),
         VarFromEnv("GITOPS_AUTH_PASSWORD"),
         VarFromEnv("QUAY_IO_CREDS_USR", is_secret=False),
         VarFromEnv("QUAY_IO_CREDS_PSW"),

templates/data.yaml

@@ -21,6 +21,10 @@ build_variables:
     commented_out: true
   - name: GITOPS_AUTH_USERNAME
     if: 'isGitLab'
+  - name: GITOPS_AUTH_USERNAME
+    if: 'isAzure'
+    commented_out: true
+    comment: "Uncomment this when using Bitbucket"
 
   - name: IMAGE_REGISTRY_USER
     if: 'isGitHub || isAzure'
@@ -64,6 +68,11 @@ build_variables:
 build_secrets:
   - name: ROX_API_TOKEN
 
+  - name: GITOPS_AUTH_USERNAME
+    if: 'isAzure'
+    commented_out: true
+    comment: "Uncomment this when using Bitbucket"
+
   - name: GITOPS_AUTH_PASSWORD
 
   - name: IMAGE_REGISTRY_PASSWORD