From a89717fdb2f78e9e1947f35d0098cd379f00643a Mon Sep 17 00:00:00 2001 From: Wolfgang Kulhanek Date: Tue, 23 Aug 2022 11:43:28 -0400 Subject: [PATCH] Fix repo names (#5296) Co-authored-by: Wolfgang Kulhanek --- .../ocp4_workload_ama_demo_shared/defaults/main.yaml | 4 ++-- .../templates/apps/application.yaml.j2 | 2 +- .../templates/cicd/applicationset.yaml.j2 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/defaults/main.yaml b/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/defaults/main.yaml index 8ddf1fb6810..faed85de203 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/defaults/main.yaml +++ b/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/defaults/main.yaml @@ -100,7 +100,7 @@ ocp4_workload_ama_demo_shared_tomcat_download_url: https://gpte-public.s3.amazon # ocp4_workload_ama_demo_shared_tomcat_download_url: https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.64/bin/apache-tomcat-9.0.64.tar.gz # Repo to use to build the customer application -ocp4_workload_ama_demo_shared_tomcat_repo_name: appmod_enablement +ocp4_workload_ama_demo_shared_tomcat_repo_name: modern-app-dev ocp4_workload_ama_demo_shared_tomcat_repo_branch: main ocp4_workload_ama_demo_shared_tomcat_repo_user: user1 # Set password in config @@ -122,7 +122,7 @@ ocp4_workload_ama_demo_shared_gitea_user_count: 2 ocp4_workload_ama_demo_shared_gitea_user_prefix: user # Set via config ocp4_workload_ama_demo_shared_gitea_user_password: "" -ocp4_workload_ama_demo_shared_gitea_repo: app-mod-projects +ocp4_workload_ama_demo_shared_gitea_repo: modern-app-dev ocp4_workload_ama_demo_shared_gitea_repo_branch: main # Demo pipeline setup diff --git a/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/apps/application.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/apps/application.yaml.j2 index d63fb52b9ca..f88825a7a2d 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/apps/application.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/apps/application.yaml.j2 @@ -17,7 +17,7 @@ spec: prune: false selfHeal: false source: - repoURL: http://{{ ocp4_workload_ama_demo_shared_gitea_instance }}.{{ ocp4_workload_ama_demo_shared_gitea_project }}.svc:3000/{{ _ocp4_workload_ama_demo_shared_user }}/app-mod-projects + repoURL: http://{{ ocp4_workload_ama_demo_shared_gitea_instance }}.{{ ocp4_workload_ama_demo_shared_gitea_project }}.svc:3000/{{ _ocp4_workload_ama_demo_shared_user }}/{{ ocp4_workload_ama_demo_shared_gitea_repo }} targetRevision: main path: helm/argoapps helm: diff --git a/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/cicd/applicationset.yaml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/cicd/applicationset.yaml.j2 index 6c6c3ad146b..eca77c07bf9 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/cicd/applicationset.yaml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_ama_demo_shared/templates/cicd/applicationset.yaml.j2 @@ -28,7 +28,7 @@ spec: prune: false selfHeal: false source: - repoURL: "http://{{ ocp4_workload_ama_demo_shared_gitea_instance }}.{{ ocp4_workload_ama_demo_shared_gitea_project }}.svc:3000/{% raw %}{{ user }}{% endraw %}/app-mod-projects" + repoURL: "http://{{ ocp4_workload_ama_demo_shared_gitea_instance }}.{{ ocp4_workload_ama_demo_shared_gitea_project }}.svc:3000/{% raw %}{{ user }}{% endraw %}/{{ ocp4_workload_ama_demo_shared_gitea_repo }}" targetRevision: main path: helm/cicd helm: @@ -39,6 +39,6 @@ spec: demoNamespace: "{{ ocp4_workload_ama_demo_shared_demo_namespace_prefix }}{% raw %}{{ user }}{% endraw %}" cicdNamespace: "{{ ocp4_workload_ama_demo_shared_pipeline_namespace_prefix }}{% raw %}{{ user }}{% endraw %}" repo: - url: "http://{{ ocp4_workload_ama_demo_shared_gitea_instance }}.{{ ocp4_workload_ama_demo_shared_gitea_project }}.svc:3000/{% raw %}{{ user }}{% endraw %}/app-mod-projects" + url: "http://{{ ocp4_workload_ama_demo_shared_gitea_instance }}.{{ ocp4_workload_ama_demo_shared_gitea_project }}.svc:3000/{% raw %}{{ user }}{% endraw %}/{{ ocp4_workload_ama_demo_shared_gitea_repo }}" user: "{% raw %}{{ user }}{% endraw %}" password: {{ ocp4_workload_ama_demo_shared_gitea_user_password }}