Merge pull request #129 from majguo/reference-to-new-base-image

Reference to new base images

Author: git4rk

.github/workflows/package.yaml

@@ -4,7 +4,7 @@ on:
   # Allows you to run this workflow using GitHub APIs
   # PERSONAL_ACCESS_TOKEN=<GITHUB_PERSONAL_ACCESS_TOKEN>
   # REPO_NAME=WASdev/azure.websphere-traditional.cluster
-  # curl --verbose -XPOST -u "WASdev:${PERSONAL_ACCESS_TOKEN}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/${REPO_NAME}/actions/workflows/package.yaml/dispatches --data '{"ref": "master"}'
+  # curl --verbose -XPOST -u "WASdev:${PERSONAL_ACCESS_TOKEN}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/${REPO_NAME}/actions/workflows/package.yaml/dispatches --data '{"ref": "main"}'
   repository_dispatch:
     types: [package]
   # sample request

README.md

@@ -1,7 +1,9 @@
 # Related Repositories
 
-* [Base images deployed by this Azure application](https://github.com/WASdev/azure.websphere-traditional.image)
-* [tWAS on VMs, Single server](https://github.com/WASdev/azure.websphere-traditional.singleserver)
+* Base images deployed by this Azure application
+  * [twas-nd](https://github.com/WASdev/azure.websphere-traditional.image/tree/main/twas-nd)
+  * [ihs](https://github.com/WASdev/azure.websphere-traditional.image/tree/main/ihs)
+* [WebSphere traditional single server](https://github.com/WASdev/azure.websphere-traditional.singleserver)
 * [Liberty on ARO](https://github.com/WASdev/azure.liberty.aro)
 * [Liberty on AKS](https://github.com/WASdev/azure.liberty.aks)
 

docs/howto-update-for-was-fixpack.md

@@ -5,7 +5,7 @@ Please follow sections below in order to update the solution for next tWAS fixpa
 ## Updating the image
 
 1. Which file to update for WAS version?
-   * For `twas-nd` image, update the following properties in file [`virtualimage.properties`](https://github.com/WASdev/azure.websphere-traditional.image/blob/master/twas-nd/src/main/scripts/virtualimage.properties#L14-L15), e.g.:
+   * For `twas-nd` image, update the following properties in file [`virtualimage.properties`](https://github.com/WASdev/azure.websphere-traditional.image/blob/main/twas-nd/src/main/scripts/virtualimage.properties#L14-L15), e.g.:
 
      ```bash
      WAS_ND_TRADITIONAL=com.ibm.websphere.ND.v90
@@ -14,7 +14,7 @@ Please follow sections below in order to update the solution for next tWAS fixpa
 
      Note: only the major version should be specified, the minor version should not be hard-coded as the Installation Manager will intelligently install the latest available minor version.
 
-   * For `ihs` image, update the following properties in file [`virtualimage.properties`](https://github.com/WASdev/azure.websphere-traditional.image/blob/master/ihs/src/main/scripts/virtualimage.properties#L22-L25), e.g.:
+   * For `ihs` image, update the following properties in file [`virtualimage.properties`](https://github.com/WASdev/azure.websphere-traditional.image/blob/main/ihs/src/main/scripts/virtualimage.properties#L22-L25), e.g.:
 
      ```bash
      IBM_HTTP_SERVER=com.ibm.websphere.IHS.v90
@@ -63,14 +63,14 @@ Please follow sections below in order to update the solution for next tWAS fixpa
    Note: Currently Graham Charters has privilege to update the image in marketplace, contact him for more information.
 
 1. Do we need to update the solution every time we do the image update?
-   * Yes. That's because image versions of [`twas-nd`](https://github.com/WASdev/azure.websphere-traditional.cluster/blob/master/pom.xml#L51) and [`ihs`](https://github.com/WASdev/azure.websphere-traditional.cluster/blob/master/pom.xml#L57) are explicitely referenced in the tWAS solutoin. Make sure correct image versions are specified in the `pom.xml` of the solution code.
+   * Yes. That's because image versions of [`twas-nd`](https://github.com/WASdev/azure.websphere-traditional.cluster/blob/main/pom.xml#L51) and [`ihs`](https://github.com/WASdev/azure.websphere-traditional.cluster/blob/main/pom.xml#L57) are explicitely referenced in the tWAS solution. Make sure correct image versions are specified in the `pom.xml` of the solution code.
 
 ## Updating and publishing the solution code
 
 Note: The steps included in this section are also applied to release new features / bug fixes which have no changes to the images.
 
 1. How to update the version of the solution?
-   * Increase the [version number](https://github.com/WASdev/azure.websphere-traditional.cluster/blob/master/pom.xml#L23) which is specified in the `pom.xml`
+   * Increase the [version number](https://github.com/WASdev/azure.websphere-traditional.cluster/blob/main/pom.xml#L23) which is specified in the `pom.xml`
    * Also update the `twasnd.image.version` and `ihs.image.version` (obtained from publish step)
 
 1. How to run CI/CD?
@@ -96,7 +96,7 @@ Note: The steps included in this section are also applied to release new feature
 1. Create a [release](https://github.com/WASdev/azure.websphere-traditional.cluster/releases) for this GA code and tag with the pom.xml version number.
 
 1. How to test the solution, what testcases to run?
-   1. Wait until the soluton offer is in `Publisher signoff` (aka "preview") stage;
+   1. Wait until the solution offer is in `Publisher signoff` (aka "preview") stage;
    1. Run test cases defined in [twas-solution-test-cases.pdf](twas-solution-test-cases.pdf). Note: use "preview link" for each test case.
 
 ## What needs to be cleaned up from test env and how to clean them up?

pom.xml

@@ -20,7 +20,7 @@
 
     <groupId>com.ibm.websphere.azure</groupId>
     <artifactId>azure.websphere-traditional.cluster</artifactId>
-    <version>1.3.26</version>
+    <version>1.3.27</version>
 
     <parent>
         <groupId>com.microsoft.azure.iaas</groupId>
@@ -48,12 +48,12 @@
         <!-- This is the twas-nd "Plan ID" of the plan within the "Azure Virtual Machine" offer -->
         <twasnd.image.sku>2021-04-27-twas-cluster-base-image</twasnd.image.sku>
         <!-- This is the twas-nd "Disk version" of the VM image of the plan within the "Azure Virtual Machine" offer -->
-        <twasnd.image.version>9.0.20210930</twasnd.image.version>
+        <twasnd.image.version>9.0.20211220</twasnd.image.version>
         <!-- This is the ihs "Offer ID" of the "Azure Virtual Machine" offer type -->
         <ihs.image.offer>2021-06-03-ihs-base-image</ihs.image.offer>
         <!-- This is the ihs "Plan ID" of the plan within the "Azure Virtual Machine" offer -->
         <ihs.image.sku>2021-06-03-ihs-base-image</ihs.image.sku>
         <!-- This is the ihs "Disk version" of the VM image of the plan within the "Azure Virtual Machine" offer -->
-        <ihs.image.version>9.0.20210930</ihs.image.version>
+        <ihs.image.version>9.0.20211220</ihs.image.version>
     </properties>
 </project>

src/main/arm/mainTemplate.json

@@ -668,6 +668,7 @@
             }
         },
         {
+            "condition": "[parameters('configureIHS')]",
             "type": "Microsoft.Resources/deployments",
             "apiVersion": "${azure.apiVersion}",
             "name": "ihsVMCreated",

src/main/resources/README.md

@@ -2,7 +2,7 @@
 
 - Content that required to create an Azure applicatoin offer from [Commerical Marketplace Overview](https://partner.microsoft.com/en-us/dashboard/commercial-marketplace/overview) -> New Offer > Azure Application
 - See [Azure applicatoin offer](https://docs.microsoft.com/en-us/azure/marketplace/cloud-partner-portal/azure-applications/cpp-azure-app-offer) for details
-- When submitting the offer, use content from [this directory](https://github.com/WASdev/azure.websphere-traditional.cluster/tree/master/src/main/resources) (To-Be-Changed), but apply the changes in this file on top
+- When submitting the offer, use content from [this directory](https://github.com/WASdev/azure.websphere-traditional.cluster/tree/main/src/main/resources) (To-Be-Changed), but apply the changes in this file on top
 
 ## New offer
 
@@ -104,7 +104,7 @@
 
 #### Store logos
 
-- [marketing-artifacts](https://github.com/WASdev/azure.websphere-traditional.cluster/tree/master/src/main/resources/marketing-artifacts)
+- [marketing-artifacts](https://github.com/WASdev/azure.websphere-traditional.cluster/tree/main/src/main/resources/marketing-artifacts)
   - Small: 48*48
   - Medium: 90*90
   - Large: 216*216