Skip to content

Commit

Permalink
QA to examples-nosql-cluster-deployment - Urgent fixes for LiveLab se…
Browse files Browse the repository at this point in the history
…rverless (#166)

* QA April 2024

- using latest NoSQL version for examples-nosql-cluster-deployment
- adapting the code to use ARM images by default - the default instance for Cloud Shell is now ARM

* QA - April 2024 - new zip files

* Update data.sh because PAR URL expiration

* Update data.sh

* QA : new zip files

* QA new zip files

* Update data.sh

* New zip files
  • Loading branch information
dario-vega authored Apr 9, 2024
1 parent 79da812 commit 05b3d83
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 63 deletions.
2 changes: 1 addition & 1 deletion demo-livelab/demo-lab-nosql/data.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mkdir ~/BaggageData
cd ~/BaggageData
curl https://objectstorage.us-ashburn-1.oraclecloud.com/p/GzwEz9xBCBHrd0gx1QE0U8hqvNTKzmKcs1pSx3CQ2Ip9A05Z1vHgPNeVRMx_1cLp/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz
curl https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz
tar xvzf BaggageData.tar.gz
rm BaggageData.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion demo-livelab/serverless-with-nosql-database/data.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mkdir ~/BaggageData
cd ~/BaggageData
curl https://objectstorage.us-ashburn-1.oraclecloud.com/p/GzwEz9xBCBHrd0gx1QE0U8hqvNTKzmKcs1pSx3CQ2Ip9A05Z1vHgPNeVRMx_1cLp/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz
curl https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz
tar xvzf BaggageData.tar.gz
rm BaggageData.tar.gz

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
schema_version: 20180708
name: demo-api
version: 0.0.1
runtime: docker
runtime: node
build_image: fnproject/node:18-dev
run_image: fnproject/node:18
entrypoint: node func.js
memory: 256
timeout: 120
idle_timeout: 1800
idle_timeout: 1800

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
schema_version: 20180708
name: demo-keyval-load
version: 0.0.1
runtime: docker
runtime: node
build_image: fnproject/node:18-dev
run_image: fnproject/node:18
entrypoint: node func.js
memory: 256
timeout: 120
idle_timeout: 1800
idle_timeout: 1800

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
schema_version: 20180708
name: demo-load
version: 0.0.1
runtime: docker
runtime: node
build_image: fnproject/node:18-dev
run_image: fnproject/node:18
entrypoint: node func.js
memory: 256
timeout: 120
idle_timeout: 1800
idle_timeout: 1800
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ schema_version: 20180708
name: load-target
version: 0.0.1
runtime: python
build_image: fnproject/python:3.11-dev
run_image: fnproject/python:3.11
entrypoint: /python/bin/fdk /function/func.py handler
memory: 256
timeout: 300
1 change: 1 addition & 0 deletions demo-livelab/serverless-with-nosql-database/functions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ resource oci_functions_application export_nosql_demos_1 {
defined_tags = {
}
display_name = "nosql_demos"
shape = "GENERIC_ARM"
freeform_tags = {
}
subnet_ids = [
Expand Down
6 changes: 3 additions & 3 deletions examples-nosql-cluster-deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,14 +216,14 @@ In this demo, we will use the Oracle NoSQL Database bundle - Enterprise Edition
For more information about difference between versions (CE vs EE) and other topics, visit the [FAQ](https://www.oracle.com/database/technologies/nosqldb-learnmore-nosqldb-faq.html)

```bash
unzip kv-ee-23.3.30.zip -d nosql
unzip kv-ee-23.3.32.zip -d nosql
unzip nosql-migrator-1.5.0.zip
````
Modify the file `env.sh` and `env-proxy.sh` with the appropriate kvhome path location. e.g.
```bash
export KVHOME=$HOME/nosql/kv-23.3.30
export KVHOME=$HOME/nosql/kv-23.3.32
```
Download, unzip NoSQL SDK for Java and compile the NoSQL SDK for Java examples. We will use java programs to test the configuration. Other language SDKs
Expand Down Expand Up @@ -509,7 +509,7 @@ The following error can be safely ignored when running the command `bash stop.sh
````bash
$ bash stop.sh
23.3.30 2023-12-01 19:36:45 UTC Build id: c5db6593507b Edition: Client
23.3.32 2024-03-06 18:21:38 UTC Build id: 69f48431fc69 Edition: Client
Failed to stop SNA: Bootstrap config file /home/opc/nosql/kvroot/config.xml does not exist
````
Expand Down
2 changes: 1 addition & 1 deletion examples-nosql-cluster-deployment/script/env-proxy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

export KVHOME=$HOME/nosql/kv-23.3.30
export KVHOME=$HOME/nosql/kv-23.3.32
export KVHOST=`hostname`
export KVSTORE=OUG
export PROXYHOME=/home/opc/proxy
Expand Down
2 changes: 1 addition & 1 deletion examples-nosql-cluster-deployment/script/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

export KVHOME=$HOME/nosql/kv-23.3.30
export KVHOME=$HOME/nosql/kv-23.3.32

export KVROOT=$HOME/nosql/kvroot
export KVDATA=$HOME/nosql/data
Expand Down
4 changes: 0 additions & 4 deletions zips/README.md

This file was deleted.

Binary file modified zips/demo-lab-baggage.zip
Binary file not shown.
Binary file modified zips/demo-lab-nosql.zip
Binary file not shown.
Binary file modified zips/examples-nosql-cluster-deployment.zip
Binary file not shown.
Binary file modified zips/serverless-with-nosql-database.zip
Binary file not shown.
Binary file modified zips/video-on-demand-with-nosql-database.zip
Binary file not shown.

0 comments on commit 05b3d83

Please sign in to comment.