Changes made to run on OCP4 environment.[D

Signed-off-by: Marco Yeung <[email protected]>
rh-integration · Oct 22, 2020 · 2ecfc37 · 2ecfc37
1 parent fc154e5
commit 2ecfc37
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 35 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
     parameters {
         string(defaultValue: 'notinuse', name: 'OPENSHIFT_HOST', description: 'open shift cluster url')
         string(defaultValue: 'notinuse', name: 'OPENSHIFT_TOKEN', description: 'open shift token')
-        string(defaultValue: 'docker-registry.default.svc:5000', name: 'IMAGE_REGISTRY', description: 'open shift token')
+        string(defaultValue: 'image-registry.openshift-image-registry.svc:5000', name: 'IMAGE_REGISTRY', description: 'open shift token')
         string(defaultValue: 'rh-dev', name: 'IMAGE_NAMESPACE', description: 'name space where image deployed')
         string(defaultValue: 'all', name: 'DEPLOY_MODULE', description: 'target module to work on')
         string(defaultValue: 'rh-dev', name: 'DEV_PROJECT', description: 'build or development project')
@@ -581,7 +581,7 @@ pipeline {
 
                     retry(5) {
 
-                        sh """set -e +x
+                        sh """set -e -x
                           curl -k -f -w "UserAlert: %{http_code}\n" -o /dev/null -s ${
                             sandbox_endpoint
                         }/cicd/maingateway/profile/11111?alertType=ACCIDENT"&api-key=${service.applications[0].userkey}"
@@ -685,7 +685,7 @@ def deploy(folderName, projName, openShiftHost, openShiftToken, mysqlUser, mysql
 
 def makePostRequest(url, body, method) {
 
-    sh """set -e +x
+    sh """set -e -x
 
     curl -X POST   ${url} \
     -H 'cache-control: no-cache' \
@@ -700,7 +700,7 @@ def makePostRequest(url, body, method) {
 def makeGetRequest(url) {
 
 
-    sh """set -e +x
+    sh """set -e -x
                           curl -k -f -w "SmokeTest: %{http_code}\n" -o /dev/null -s ${url}
     """
 }

diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ TEST_PROJECT
 PROD_PROJECT                                                                
 MYSQL_USER                                                                  dbuser
 MYSQL_PWD                                                                   password
-IMAGE_REGISTRY                                                              docker-registry.default.svc:5000
+IMAGE_REGISTRY                                                              image-registry.openshift-image-registry.svc:5000
 IMAGE_NAMESPACE                                                             
 PRIVATE_BASE_URL                                                            http://maingateway-service-rh-test.app.middleware.ocp.cloud.lab.eng.bos.redhat.com
 PRODUCTION_PUBLIC_BASE_URL                                                  https://3scalefuse.app.middleware.ocp.cloud.lab.eng.bos.redhat.com
@@ -149,19 +149,19 @@ oc delete bc publish-api-3scale
 ```sh
 
 # import fuse-user-service pipeline
-oc new-app -f fuse-user-service/src/main/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=docker-registry.default.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
+oc new-app -f fuse-user-service/src/main/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=image-registry.openshift-image-registry.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
 
 # import maingateway-service pipeline
-oc new-app -f maingateway-service/src/main/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=docker-registry.default.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
+oc new-app -f maingateway-service/src/main/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=image-registry.openshift-image-registry.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
 
 # import nodejsalert-ui pipeline
-oc new-app -f nodejsalert-ui/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=docker-registry.default.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
+oc new-app -f nodejsalert-ui/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=image-registry.openshift-image-registry.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
 
 # import fuse-alert-service pipeline
-oc new-app -f fuse-alert-service/src/main/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=docker-registry.default.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
+oc new-app -f fuse-alert-service/src/main/resources/pipeline-app-build.yml -p IMAGE_REGISTRY=image-registry.openshift-image-registry.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod
 
 # import aggregated-pipeline
-oc new-app -f pipelinetemplates/pipeline-aggregated-build.yml -p IMAGE_REGISTRY=docker-registry.default.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod  -p PRIVATE_BASE_URL=http://maingateway-service-rh-test.app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p PUBLIC_PRODUCTION_WILDCARD_DOMAIN=app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p PUBLIC_STAGING_WILDCARD_DOMAIN=staging.app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p DEVELOPER_ACCOUNT_ID=developer
+oc new-app -f pipelinetemplates/pipeline-aggregated-build.yml -p IMAGE_REGISTRY=image-registry.openshift-image-registry.svc:5000 -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod  -p PRIVATE_BASE_URL=http://maingateway-service-rh-test.app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p PUBLIC_PRODUCTION_WILDCARD_DOMAIN=app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p PUBLIC_STAGING_WILDCARD_DOMAIN=staging.app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p DEVELOPER_ACCOUNT_ID=developer
 
 # import 3scale pipeline
 oc new-app -f cicd-3scale/3scaletoolbox/pipeline-template.yaml  -p IMAGE_NAMESPACE=rh-dev -p DEV_PROJECT=rh-dev -p TEST_PROJECT=rh-test -p PROD_PROJECT=rh-prod  -p PRIVATE_BASE_URL=http://maingateway-service-rh-test.app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p PUBLIC_PRODUCTION_WILDCARD_DOMAIN=app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p PUBLIC_STAGING_WILDCARD_DOMAIN=staging.app.middleware.ocp.cloud.lab.eng.bos.redhat.com -p DEVELOPER_ACCOUNT_ID=developer 

diff --git a/cicd-3scale/3scaletoolbox/Jenkinsfile b/cicd-3scale/3scaletoolbox/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
     parameters{
         string (defaultValue: 'notinuse', name:'OPENSHIFT_HOST', description:'open shift cluster url')
         string (defaultValue: 'notinuse', name:'OPENSHIFT_TOKEN', description:'open shift token')
-        string (defaultValue: 'docker-registry.default.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
+        string (defaultValue: 'image-registry.openshift-image-registry.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
         string (defaultValue: 'rh-dev', name:'IMAGE_NAMESPACE', description:'name space where image deployed')
         string (defaultValue: 'rh-dev', name:'DEV_PROJECT', description:'build or development project')
         string (defaultValue: 'rh-test', name:'TEST_PROJECT', description:'Test project')
@@ -92,7 +92,7 @@ pipeline {
 
                     retry(5) {
 
-                        sh """set -e +x
+                        sh """set -e -x
                           curl -k -f -w "UserAlert: %{http_code}\n" -o /dev/null -s ${
                             sandbox_endpoint
                         }/cicd/maingateway/profile/11111?alertType=ACCIDENT"&api-key=${service.applications[0].userkey}"
@@ -187,7 +187,7 @@ pipeline {
                     def proxy = service.readProxy("sandbox")
                     def sandbox_endpoint = proxy.sandbox_endpoint
                     retry(5) {
-                        sh """set -e +x
+                        sh """set -e -x
                           curl -k -f -w "UserAlert: %{http_code}\n" -o /dev/null -s ${
                             sandbox_endpoint
                         }/cicd/maingateway/profile/11111?alertType=ACCIDENT"&api-key=${service.applications[0].userkey}"

diff --git a/cicd-3scale/3scaletoolbox/pipeline-template.yaml b/cicd-3scale/3scaletoolbox/pipeline-template.yaml
@@ -112,7 +112,7 @@ parameters:
 - name: PLAN_YAML_FILE_PATH
   value: https://raw.githubusercontent.com/rh-integration/IntegrationApp-Automation/master/cicd-3scale/3scaletoolbox/plan.yaml
 - name: TOOLBOX_IMAGE_REGISTRY
-  value: docker-registry.default.svc:5000/rh-dev/toolbox:v0.12.4
+  value: image-registry.openshift-image-registry.svc:5000/rh-dev/toolbox:v0.12.4
 
 
 

diff --git a/fuse-alert-service/Jenkinsfile b/fuse-alert-service/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
     parameters{
         string (defaultValue: 'notinuse', name:'OPENSHIFT_HOST', description:'open shift cluster url')
         string (defaultValue: 'notinuse', name:'OPENSHIFT_TOKEN', description:'open shift token')
-        string (defaultValue: 'docker-registry.default.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
+        string (defaultValue: 'image-registry.openshift-image-registry.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
         string (defaultValue: 'rh-dev', name:'IMAGE_NAMESPACE', description:'name space where image deployed')
         string (defaultValue: 'rh-dev', name:'DEV_PROJECT', description:'build or development project')
         string (defaultValue: 'rh-test', name:'TEST_PROJECT', description:'Test project')
@@ -214,7 +214,7 @@ def deploy(folderName, projName, openShiftHost, openShiftToken) {
 
 def makePostRequest(url, body, method) {
 
-	sh"""set -e +x
+	sh"""set -e -x
 
         curl -X POST   ${url} \
         -H 'cache-control: no-cache' \

diff --git a/fuse-alert-service/src/main/resources/pipeline-app-build.yml b/fuse-alert-service/src/main/resources/pipeline-app-build.yml
@@ -26,7 +26,7 @@ parameters:
   value: password 
   required: true
 - name: IMAGE_REGISTRY
-  value: docker-registry.default.svc:5000
+  value: image-registry.openshift-image-registry.svc:5000
   required: true
 - name: IMAGE_NAMESPACE 
   required: true

diff --git a/fuse-user-service/Jenkinsfile b/fuse-user-service/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
     parameters{
         string (defaultValue: 'notinuse', name:'OPENSHIFT_HOST', description:'open shift cluster url')
         string (defaultValue: 'notinuse', name:'OPENSHIFT_TOKEN', description:'open shift token')
-        string (defaultValue: 'docker-registry.default.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
+        string (defaultValue: 'image-registry.openshift-image-registry.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
         string (defaultValue: 'rh-dev', name:'IMAGE_NAMESPACE', description:'name space where image deployed')
         string (defaultValue: 'rh-dev', name:'DEV_PROJECT', description:'build or development project')
         string (defaultValue: 'rh-test', name:'TEST_PROJECT', description:'Test project')
@@ -211,7 +211,7 @@ def deploy(folderName, projName, openShiftHost, openShiftToken, mysqlUser, mysql
 }
 
 def makeGetRequest(url) {
-    sh"""set -e +x
+    sh"""set -e -x
                           curl -k -f -w "SmokeTest: %{http_code}\n" -o /dev/null -s ${url}
     """
 

diff --git a/fuse-user-service/src/main/resources/pipeline-app-build.yml b/fuse-user-service/src/main/resources/pipeline-app-build.yml
@@ -26,7 +26,7 @@ parameters:
   value: password
   required: true
 - name: IMAGE_REGISTRY
-  value: docker-registry.default.svc:5000
+  value: image-registry.openshift-image-registry.svc:5000
   required: true
 - name: IMAGE_NAMESPACE
   required: true

diff --git a/maingateway-service/Jenkinsfile b/maingateway-service/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
     parameters{
         string (defaultValue: 'notinuse', name:'OPENSHIFT_HOST', description:'open shift cluster url')
         string (defaultValue: 'notinuse', name:'OPENSHIFT_TOKEN', description:'open shift token')
-        string (defaultValue: 'docker-registry.default.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
+        string (defaultValue: 'image-registry.openshift-image-registry.svc:5000', name:'IMAGE_REGISTRY', description:'open shift token')
         string (defaultValue: 'rh-dev', name:'IMAGE_NAMESPACE', description:'name space where image deployed')
         string (defaultValue: 'rh-dev', name:'DEV_PROJECT', description:'build or development project')
         string (defaultValue: 'rh-test', name:'TEST_PROJECT', description:'Test project')
@@ -209,7 +209,7 @@ def deploy(folderName, projName, openShiftHost, openShiftToken) {
 
 def makeGetRequest(url) {
 
-    sh"""set -e +x
+    sh"""set -e -x
       curl -k -f -w "SmokeTest: %{http_code}\n" -o /dev/null -s ${url}
     """
 

diff --git a/maingateway-service/src/main/resources/pipeline-app-build.yml b/maingateway-service/src/main/resources/pipeline-app-build.yml
@@ -20,7 +20,7 @@ parameters:
 - name: PROD_PROJECT 
   required: true
 - name: IMAGE_REGISTRY
-  value: docker-registry.default.svc:5000
+  value: image-registry.openshift-image-registry.svc:5000
   required: true
 - name: IMAGE_NAMESPACE 
   required: true

diff --git a/nodejsalert-ui/Jenkinsfile b/nodejsalert-ui/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
     parameters {
         string(defaultValue: 'notinuse', name: 'OPENSHIFT_HOST', description: 'open shift cluster url')
         string(defaultValue: 'notinuse', name: 'OPENSHIFT_TOKEN', description: 'open shift token')
-        string(defaultValue: 'docker-registry.default.svc:5000', name: 'IMAGE_REGISTRY', description: 'open shift token')
+        string(defaultValue: 'image-registry.openshift-image-registry.svc:5000', name: 'IMAGE_REGISTRY', description: 'open shift token')
         string(defaultValue: 'rh-dev', name: 'IMAGE_NAMESPACE', description: 'name space where image deployed')
         string(defaultValue: 'rh-dev', name: 'DEV_PROJECT', description: 'build or development project')
         string(defaultValue: 'rh-test', name: 'TEST_PROJECT', description: 'Test project')
@@ -321,7 +321,7 @@ def promoteService(imageNamespace, projName, dcName) {
 
 def makeGetRequest(url) {
 
-    sh """set -e +x
+    sh """set -e -x
           curl -k -f -w "SmokeTest: %{http_code}\n" -o /dev/null -s ${url}
         """
 

diff --git a/nodejsalert-ui/package.json b/nodejsalert-ui/package.json
@@ -57,7 +57,7 @@
   "devDependencies": {
     "coveralls": "^3.0.0",
     "js-yaml": "^3.10.0",
-    "nodeshift": "~1.12.0",
+    "nodeshift": "~6.0.2",
     "nsp": "~3.2.1",
     "nyc": "~12.0.2",
     "rhoaster": "~0.2.0",

diff --git a/nodejsalert-ui/resources/pipeline-app-build.yml b/nodejsalert-ui/resources/pipeline-app-build.yml
@@ -20,7 +20,7 @@ parameters:
 - name: PROD_PROJECT 
   required: true
 - name: IMAGE_REGISTRY
-  value: docker-registry.default.svc:5000
+  value: image-registry.openshift-image-registry.svc:5000
   required: true
 - name: IMAGE_NAMESPACE 
   required: true

diff --git a/pipelinetemplates/pipeline-aggregated-build.yml b/pipelinetemplates/pipeline-aggregated-build.yml
@@ -26,7 +26,7 @@ parameters:
   value: password 
   required: false
 - name: IMAGE_REGISTRY
-  value: docker-registry.default.svc:5000
+  value: image-registry.openshift-image-registry.svc:5000
   required: true
 - name: IMAGE_NAMESPACE 
   required: true
@@ -60,7 +60,7 @@ parameters:
 - name: PLAN_YAML_FILE_PATH
   value: https://raw.githubusercontent.com/rh-integration/IntegrationApp-Automation/master/cicd-3scale/3scaletoolbox/plan.yaml
 - name: TOOLBOX_IMAGE_REGISTRY
-  value: docker-registry.default.svc:5000/rh-dev/toolbox:v0.12.4
+  value: image-registry.openshift-image-registry.svc:5000/rh-dev/toolbox:v0.12.4
 
 objects:
 - apiVersion: v1

diff --git a/setup/setup.sh b/setup/setup.sh
@@ -11,11 +11,11 @@ done
 
 oc new-app jenkins-persistent
 
-echo "Setup the surrounding softwate and environment"
+echo "Setup the surrounding software and environment"
 echo
 echo "Start up MySQL for database access"
 
-oc new-app mysql-ephemeral --param=MYSQL_PASSWORD=password --param=MYSQL_USER=dbuser --param=MYSQL_DATABASE=sampledb
+oc new-app mysql-ephemeral --param=MYSQL_PASSWORD=password --param=MYSQL_USER=dbuser --param=MYSQL_DATABASE=sampledb --param=MYSQL_VERSION=5.7
 
 echo "Start up Broker"
 
@@ -36,11 +36,11 @@ oc new-app -f fuse-alert-service/src/main/resources/pipeline-app-build.yml -p IM
 
 
 echo "import integration-master-pipeline"
-oc new-app -f pipelinetemplates/pipeline-aggregated-build.yml -p IMAGE_NAMESPACE=$DEV_PROJECT -p DEV_PROJECT=$DEV_PROJECT -p TEST_PROJECT=$TEST_PROJECT -p PROD_PROJECT=$PROD_PROJECT -p PROD_PROJECT=rh-prod -p PUBLIC_PRODUCTION_WILDCARD_DOMAIN=app.your.wildcard.domain -p PUBLIC_STAGING_WILDCARD_DOMAIN=staging.app.your.wildcard.domain -p DEVELOPER_ACCOUNT_ID=developer-account
+oc new-app -f pipelinetemplates/pipeline-aggregated-build.yml -p IMAGE_NAMESPACE=$DEV_PROJECT -p DEV_PROJECT=$DEV_PROJECT -p TEST_PROJECT=$TEST_PROJECT -p PROD_PROJECT=$PROD_PROJECT -p PUBLIC_PRODUCTION_WILDCARD_DOMAIN=app.your.wildcard.domain -p PUBLIC_STAGING_WILDCARD_DOMAIN=staging.app.your.wildcard.domain -p DEVELOPER_ACCOUNT_ID=developer
 
 
 echo "import 3scale API publishing pipeline"
-oc new-app -f cicd-3scale/3scaletoolbox/pipeline-template.yaml -p IMAGE_NAMESPACE=$DEV_PROJECT -p DEV_PROJECT=$DEV_PROJECT -p TEST_PROJECT=$TEST_PROJECT -p PROD_PROJECT=$PROD_PROJECT -p PROD_PROJECT=rh-prod  -p PUBLIC_PRODUCTION_WILDCARD_DOMAIN=app.your.wildcard.domain -p PUBLIC_STAGING_WILDCARD_DOMAIN=staging.app.your.wildcard.domain -p DEVELOPER_ACCOUNT_ID=developer-account
+oc new-app -f cicd-3scale/3scaletoolbox/pipeline-template.yaml -p IMAGE_NAMESPACE=$DEV_PROJECT -p DEV_PROJECT=$DEV_PROJECT -p TEST_PROJECT=$TEST_PROJECT -p PROD_PROJECT=$PROD_PROJECT -p PUBLIC_PRODUCTION_WILDCARD_DOMAIN=app.your.wildcard.domain -p PUBLIC_STAGING_WILDCARD_DOMAIN=staging.app.your.wildcard.domain -p DEVELOPER_ACCOUNT_ID=developer
 
 oc new-project $TEST_PROJECT 2> /dev/null
 while [ $? \> 0 ]; do
@@ -54,7 +54,7 @@ echo "Setup the surrounding softwate and environment"
 echo
 echo "Start up MySQL for database access"
 
-oc new-app mysql-ephemeral --param=MYSQL_PASSWORD=password --param=MYSQL_USER=dbuser --param=MYSQL_DATABASE=sampledb
+oc new-app mysql-ephemeral --param=MYSQL_PASSWORD=password --param=MYSQL_USER=dbuser --param=MYSQL_DATABASE=sampledb --param=MYSQL_VERSION=5.7
 
 echo "Start up Broker"
 oc new-app -f projecttemplates/amq-broker-74-basic.yaml --param=AMQ_USER=admin --param=AMQ_PASSWORD=admin
@@ -78,7 +78,7 @@ echo "Setup the surrounding softwate and environment"
 echo
 echo "Start up MySQL for database access"
 oc project $PROD_PROJECT
-oc new-app mysql-ephemeral --param=MYSQL_PASSWORD=password --param=MYSQL_USER=dbuser --param=MYSQL_DATABASE=sampledb
+oc new-app mysql-ephemeral --param=MYSQL_PASSWORD=password --param=MYSQL_USER=dbuser --param=MYSQL_DATABASE=sampledb --param=MYSQL_VERSION=5.7
 
 echo "Start up Broker"
 oc new-app -f projecttemplates/amq-broker-74-basic.yaml --param=AMQ_USER=admin --param=AMQ_PASSWORD=admin