PS C:\Users\debjit.
bhowmik_7749\cookbooks> git branch
Feature/Debjit
* Feature/Image-Release-Debjit
debug/paas
PS C:\Users\debjit.bhowmik_7749\cookbooks> git switch debug/paas
Switched to branch 'debug/paas'
Your branch is behind 'origin/debug/paas' by 6 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
PS C:\Users\debjit.bhowmik_7749\cookbooks> git pull
remote: Enumerating objects: 10, done.
remote: Counting objects: 100% (10/10), done.
remote: Compressing objects: 100% (10/10), done.
remote: Total 10 (delta 4), reused 2 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (10/10), 10.95 KiB | 224.00 KiB/s, done.
From github.com:debjitbhowmik807/cookbooks
de385ac..3d5c84c debug/paas -> origin/debug/paas
Updating 04548a7..3d5c84c
Fast-forward
AWS Build Cloud Account Id Artefacts.yml | 286 ++++++
AWS Build Image Release Artefacts.yml | 148 +--
AWS Publish Cloud Account Id Images.yml | 130 +++
AWS Publish Images.yml | 1038 ++++++++++++++++++++
AWS Publish Templates.yml | 959 ++++++++++++++++++
Aws-Images-Cookbooks-CI.yml | 381 +++++--
Azure Build Image Release Artefacts.yml | 1013 +++++++++++++++++++
Azure Image Release.yaml | 617 ++++++++++++
Azure-Build-Cloud-Account-Id-Artefacts.yml | 107 ++
AzureDevOps/templates/AWSCopyImageToUS .yml | 99 ++
AzureDevOps/templates/AWSTestAusImage.yml | 221 +++++
.../templates/AWSTestCloudAccountIdImage.yml | 210 ++++
AzureDevOps/templates/AWSTestTemplatePreview.yml | 281 ++++++
.../templates/AWSTestTemplateProduction.yml | 280 ++++++
.../templates/AWSTestTemplateValidationMaster.yml | 241 +++++
.../AWSTestTemplateValidationStackType.yml | 245 +++++
AzureDevOps/templates/AWSTestUSImage.yml | 242 +++++
AzureDevOps/templates/Azure Test Image.yml | 184 ++++
scripts/GitMerge.ps1 | 2 +-
scripts/GitRepoWriteAccess.ps1 | 2 +-
scripts/GitTag.ps1 | 2 +-
scripts/azure_set_gate_variable.ps1 | 4 +-
.../azure_set_gate_variable_cloud_account_id.ps1 | 2 +-
scripts/bake-ide-ami.ps1 | 66 +-
scripts/getchoco.ps1 | 2 +
scripts/install-lansa-base.ps1 | 52 +-
scripts/install-lansa-post-winupdates.ps1 | 2 +-
scripts/install-powershell-modules-azure.ps1 | 4 +-
scripts/installGit.ps1 | 1 +
29 files changed, 6663 insertions(+), 158 deletions(-)
create mode 100644 AWS Build Cloud Account Id Artefacts.yml
create mode 100644 AWS Publish Cloud Account Id Images.yml
create mode 100644 AWS Publish Images.yml
create mode 100644 AWS Publish Templates.yml
create mode 100644 Azure Build Image Release Artefacts.yml
create mode 100644 Azure Image Release.yaml
create mode 100644 Azure-Build-Cloud-Account-Id-Artefacts.yml
create mode 100644 AzureDevOps/templates/AWSCopyImageToUS .yml
create mode 100644 AzureDevOps/templates/AWSTestAusImage.yml
create mode 100644 AzureDevOps/templates/AWSTestCloudAccountIdImage.yml
create mode 100644 AzureDevOps/templates/AWSTestTemplatePreview.yml
Merge branch 'debug/paas' into Feature/Image-Release-Debjit
create mode 100644 AzureDevOps/templates/AWSTestTemplateProduction.yml
create mode 100644 AzureDevOps/templates/AWSTestTemplateValidationMaster.yml
create mode 100644 AzureDevOps/templates/AWSTestTemplateValidationStackType.yml
create mode 100644 AzureDevOps/templates/AWSTestUSImage.yml
create mode 100644 AzureDevOps/templates/Azure Test Image.yml
PS C:\Users\debjit.bhowmik_7749\cookbooks> git branch
Feature/Debjit
Feature/Image-Release-Debjit
* debug/paas
PS C:\Users\debjit.bhowmik_7749\cookbooks> git switch Feature/Image-Release-Debjit
Switched to branch 'Feature/Image-Release-Debjit'
Your branch is up to date with 'origin/Feature/Image-Release-Debjit'.
PS C:\Users\debjit.bhowmik_7749\cookbooks> git merge debug/paas
Merge made by the 'ort' strategy.
AWS Publish Templates.yml | 77 ++++++----------------
AzureDevOps/templates/AWSTestTemplatePreview.yml | 11 +---
.../templates/AWSTestTemplateProduction.yml | 10 +--
.../templates/AWSTestTemplateValidationMaster.yml | 11 +---
.../AWSTestTemplateValidationStackType.yml | 17 ++---
5 files changed, 33 insertions(+), 93 deletions(-)
PS C:\Users\debjit.bhowmik_7749\cookbooks> git status
On branch Feature/Image-Release-Debjit
Your branch is ahead of 'origin/Feature/Image-Release-Debjit' by 3 commits.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
PS C:\Users\debjit.bhowmik_7749\cookbooks> git push
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 8 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 448 bytes | 149.00 KiB/s, done.
Total 4 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (3/3), completed with 3 local objects.
To github.com:debjitbhowmik807/cookbooks.git
1811c26..644c3f7 Feature/Image-Release-Debjit -> Feature/Image-Release-Debjit
PS C:\Users\debjit.bhowmik_7749\cookbooks>
1. git branch
2. git switch debug/paas
3. git pull
4. git branch
5. git switch Feature/Image-Release-Debjit
6. git merge debug/paas
7. git status
8. git push