12.0.1.0-r1 update (#157)

Author: IBMRob

ApplyIFixes.sh

@@ -23,14 +23,14 @@ do
   ifixname="${ifixlink##*/}"
   ifixname="${ifixname%.tar*}" 
 
-  ./mqsifixinst.sh /opt/ibm/ace-11 install $ifixname
+  ./mqsifixinst.sh /opt/ibm/ace-12 install $ifixname
 
   #Delete directory
   cd ..
   rm -rf ./fix
 
-  rm -rf /opt/ibm/ace-11/fix-backups.11.0.0.10
-  rm /opt/ibm/ace-11/mqsifixinst.log
-  rm /opt/ibm/ace-11/mqsifixinst.sh
+  rm -rf /opt/ibm/ace-12/fix-backups.12.0.1.0
+  rm /opt/ibm/ace-12/mqsifixinst.log
+  rm /opt/ibm/ace-12/mqsifixinst.sh
 
 done

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+<!-- Only raise a PR if it's ready to be merged/reviewed.-->
+<!-- Please include a link to the Epic or issue-->
+## Relevant issue, Epic or stories.
+
+<!-- PR's without a description will be closed-->
+## Description of what this PR accomplishes and why it's needed
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+## How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+Link to ot4i-ace-docker test build: <!-- Please provide a link to a test build from https://appcon-jenkins.swg-devops.com/job/ot4i-ace-docker/ -->

README.md

@@ -15,36 +15,36 @@ For information of building images with IBM MQ Advanced please refer to [IBM App
 The IBM App Connect operator now supports a single image which includes both the ACE server runtime as well as an MQ client. This readme will describe how you can build an equivalent image.
 
 A pre-built developer edition image can be found at dockerhub - [ibmcom/ace-server](https://hub.docker.com/r/ibmcom/ace-server)
-A pre-built production edition image can be found on IBM Entitled Registry - [Obtaining the IBM App Connect Enterprise server image from the IBM Cloud Container Registry](https://www.ibm.com/support/knowledgecenter/en/SSTTDS_11.0.0/com.ibm.ace.icp.doc/certc_install_obtaininstallationimageser.html)
+A pre-built production edition image can be found on IBM Entitled Registry - [Obtaining the IBM App Connect Enterprise server image from the IBM Cloud Container Registry](https://www.ibm.com/docs/en/app-connect/11.0.0?topic=aciccd-obtaining-app-connect-enterprise-server-image-from-cloud-container-registry)
 
 
 ## Building a container image
 
-Download a copy of App Connect Enterprise (ie. `ace-11.0.0.9.tar.gz`) and place it in the `deps` folder. When building the image use `build-arg` to specify the name of the file: `--build-arg ACE_INSTALL=ace-11.0.0.9.tar.gz`
+Download a copy of App Connect Enterprise (ie. `ace-12.0.1.0.tar.gz`) and place it in the `deps` folder. When building the image use `build-arg` to specify the name of the file: `--build-arg ACE_INSTALL=ace-12.0.1.0.tar.gz`
 
-**Important:** Only ACE version **11.0.0.9 or greater** is supported.
+**Important:** Only ACE version **12.0.1.0 or greater** is supported.
 
 Choose if you want to have an image with just App Connect Enterprise or an image with both App Connect Enterprise and the IBM MQ Client libraries. The second of these is used by the IBM App Connect operator.
 
 ### Building a container image which contains an IBM Service provided fix for ACE
 
-You may have been provided with a fix for App Connect Enterprise by IBM Support, this fix will have a name of the form `11.0.0.X-ACE-LinuxX64-TF12345.tar.gz`. In order to apply this fix follow these steps.
+You may have been provided with a fix for App Connect Enterprise by IBM Support, this fix will have a name of the form `12.0.X.Y-ACE-LinuxX64-TF12345.tar.gz`. In order to apply this fix follow these steps.
  - On a local system extract the App Connect Enterprise archive
-   `tar -xvf ace-11.0.0.9.tar.gz`
+   `tar -xvf ace-12.0.1.0.tar.gz`
  - Extract the fix package into expanded App Connect Enterprise installation
-   `tar -xvf /path/to/11.0.0.9-ACE-LinuxX64-TF12345.tar.gz --directory ace-11.0.0.9`
+   `tar -xvf /path/to/12.0.1.0-ACE-LinuxX64-TF12345.tar.gz --directory ace-12.0.1.0`
  - Tar and compress the resulting App Connect Enterprise installation
-   `tar -cvf ace-11.0.0.9_with_IT12345.tar ace-11.0.0.9`
-   `gzip ace-11.0.0.9_with_IT12345.tar`
- - Place the resulting `ace-11.0.0.9_with_IT12345.tar.gz` file in the `deps` folder and when building using the `build-arg` to specify the name of the file: `--build-arg ACE_INSTALL=ace-11.0.0.9_with_IT12345.tar.gz`
+   `tar -cvf ace-12.0.1.0_with_IT12345.tar ace-12.0.1.0`
+   `gzip ace-12.0.1.0_with_IT12345.tar`
+ - Place the resulting `ace-12.0.1.0_with_IT12345.tar.gz` file in the `deps` folder and when building using the `build-arg` to specify the name of the file: `--build-arg ACE_INSTALL=ace-12.0.1.0_with_IT12345.tar.gz`
 
 ### Using App Connect Enterprise for Developers
 
 Get [ACE for Developers edition](https://www.ibm.com/marketing/iwm/iwm/web/pick.do?source=swg-wmbfd). Then place it in the `deps` folder as mentioned above.
 
 ### Build an image with App Connect Enterprise only
 
-The `deps` folder must contain a copy of ACE, **version 11.0.0.9 or greater**. If using ACE for Developers, download it from [here](https://www.ibm.com/marketing/iwm/iwm/web/pick.do?source=swg-wmbfd).
+The `deps` folder must contain a copy of ACE, **version 12.0.1.0 or greater**. If using ACE for Developers, download it from [here](https://www.ibm.com/marketing/iwm/iwm/web/pick.do?source=swg-wmbfd).
 Then set the build argument `ACE_INSTALL` to the name of the ACE file placed in `deps`.
 
 1. ACE for Developers only:
@@ -123,7 +123,6 @@ You can mount the following file structure at `/home/aceuser/initial-config`. Mi
   - You can place multiple sets of files, each with a different file name/alias; each `.crt` file must have an associated `.key` file, and a `.pass` file must be present if the private key has a passphrase.
 - `/home/aceuser/initial-config/odbcini`
   - A text file called `odbc.ini`. This must be an `odbc.ini` file suitable for the Integration Server to use when connecting to a database.  This will be copied to `/home/aceuser/ace-server/odbc.ini`.
-  - To enabled an ODBC trace, follow the steps [here](https://community.ibm.com/community/user/integration/blogs/amar-shah1/2021/05/10/enabling-odbc-trace-for-integration-server-running)
 - `/home/aceuser/initial-config/policy`
   - A set of `.policyxml` files, each with the suffix `.policyxml`, and a single `policy.descriptor` file.  These will be copied to `/home/aceuser/ace-server/overrides/DefaultPolicies/`. They should be specified in the `server.conf.yaml` section in order to be used.
 - `/home/aceuser/initial-config/serverconf`
@@ -224,6 +223,11 @@ You can mount the following file structure at `/home/aceuser/initial-config`. Mi
    ```script
    sampleFlow#MQInput.queueName=NEWC
    ```
+- `/home/aceuser/initial-config/workdir_overrides`
+  - For any parameters that need to be set via `ibm int apply overrides --work-directory /home/aceuser/ace-server` on the integration server include text files Eg:
+   ```script
+   TestFlow#HTTP Input.URLSpecifier=/production
+   ```
 
 
 ## Logging

ace_compile_bars.sh

@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-v20.html
 
 if [ -z "$MQSI_VERSION" ]; then
-  source /opt/ibm/ace-11/server/bin/mqsiprofile
+  source /opt/ibm/ace-12/server/bin/mqsiprofile
 fi
 
 if ls /home/aceuser/bars/*.bar >/dev/null 2>&1; then

ace_config_bar_overrides.sh

@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-v20.html
 
 if [ -z "$MQSI_VERSION" ]; then
-  source /opt/ibm/ace-11/server/bin/mqsiprofile
+  source /opt/ibm/ace-12/server/bin/mqsiprofile
 fi
 
 if ls /home/aceuser/initial-config/bar_overrides/*.properties >/dev/null 2>&1; then

ace_config_bars.sh

@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-v20.html
 
 if [ -z "$MQSI_VERSION" ]; then
-  source /opt/ibm/ace-11/server/bin/mqsiprofile
+  source /opt/ibm/ace-12/server/bin/mqsiprofile
 fi
 
 if ls /home/aceuser/initial-config/bars/*.bar >/dev/null 2>&1; then

ace_config_keystore.sh

@@ -22,9 +22,9 @@ if ls /home/aceuser/initial-config/keystore/*.key >/dev/null 2>&1; then
   fi
 
   IFS=$'\n'
-  KEYTOOL=/opt/ibm/ace-11/common/jdk/jre/bin/keytool
+  KEYTOOL=/opt/ibm/ace-12/common/jdk/jre/bin/keytool
   if [ ! -f "$KEYTOOL" ]; then
-    KEYTOOL=/opt/ibm/ace-11/common/jre/bin/keytool
+    KEYTOOL=/opt/ibm/ace-12/common/jre/bin/keytool
   fi
   for keyfile in `ls /home/aceuser/initial-config/keystore/*.key`; do
     if [ -s "${keyfile}" ]; then

ace_config_odbcini.sh

@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-v20.html
 
 if [ -z "$MQSI_VERSION" ]; then
-  source /opt/ibm/ace-11/server/bin/mqsiprofile
+  source /opt/ibm/ace-12/server/bin/mqsiprofile
 fi
 
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

ace_config_setdbparms.sh

@@ -23,7 +23,7 @@ function argStrings {
 }
 
 if [ -z "$MQSI_VERSION" ]; then
-  source /opt/ibm/ace-11/server/bin/mqsiprofile
+  source /opt/ibm/ace-12/server/bin/mqsiprofile
 fi
 
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

ace_config_truststore.sh

@@ -22,9 +22,9 @@ if ls /home/aceuser/initial-config/truststore/*.crt >/dev/null 2>&1; then
   fi
 
   IFS=$'\n'
-  KEYTOOL=/opt/ibm/ace-11/common/jdk/jre/bin/keytool
+  KEYTOOL=/opt/ibm/ace-12/common/jdk/jre/bin/keytool
   if [ ! -f "$KEYTOOL" ]; then
-    KEYTOOL=/opt/ibm/ace-11/common/jre/bin/keytool
+    KEYTOOL=/opt/ibm/ace-12/common/jre/bin/keytool
   fi
   for file in `ls /home/aceuser/initial-config/truststore/*.crt`; do
     if [ -s "${file}" ]; then