Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  • The Git repository is used to hold a copy of JS7 configuration objects.
  • Additionally, the Git repository is used to version JS7 configuration objects.


Flowchart
USER1USER1a [label="   User: 1   ",fillcolor="lightskyblue"]
USER2USER1b [label="   User: 2   ",fillcolor="lightskyblue"]
USER3USER1c [label="   User: 3   ",fillcolor="lightskyblue"]
JOC1 [label="   JOC Cockpit   ",fillcolor="lightskyblue"]
DATABASE [shape="ellipse",label="     Database     ",fillcolor="lightskyblue"]
REPO [label="    Git Repository    ",fillcolor="orange"]
BRANCH1 [shape="ellipse",label="    Single Branch    ",fillcolor="orange"]

JOC1 -> BRANCH1 [label="   Commit/Push\nPull   "]
# BRANCH1 -> JOC1 [label="   Pull   "]
BRANCH1 -> REPO

JOC1 -> DATABASE

USER1USER1a -> JOC1
USER2USER1b -> JOC1
USER3USER1c -> JOC1

Repository Operations

...

  • The Git repository is used to hold a copies of JS7 configuration objects in branches.
  • Additionally, the Git repository is used to version JS7 configuration objects.
  • The Git repository is used to merge branches and to rollout JS7 configuration objects to different JS7 instances, such as Dev => Test => Prod.


Flowchart
USER1USER1a [label="   User: 1a   ",fillcolor="lightskyblue"]
USER1b [label="   User: 1   1b   ",fillcolor="lightskyblue"]
USER2 [label="   User: 2   ",fillcolor="lightskyblue"]
USER3 [label="   User: 3   ",fillcolor="lightskyblue"]

JOC1 [label="   JOC Cockpit: Dev   ",fillcolor="lightskyblue"]
JOC2 [label="   JOC Cockpit: Test   ",fillcolor="lightskyblue"]
JOC3 [label="   JOC Cockpit: Prod   ",fillcolor="lightskyblue"]

DATABASE1 [shape="ellipse",label="     Database: Dev     ",fillcolor="lightskyblue"]
DATABASE2 [shape="ellipse",label="     Database: Test     ",fillcolor="lightskyblue"]
DATABASE3 [shape="ellipse",label="     Database: Prod     ",fillcolor="lightskyblue"]
REPO [label="    Git Repository    ",fillcolor="orange"]

BRANCH1 [shape="ellipse",label="    Branch: Dev    ",fillcolor="orange"]
BRANCH2 [shape="ellipse",label="    Branch: Test    ",fillcolor="orange"]
BRANCH3 [shape="ellipse",label="    Branch: Prod    ",fillcolor="orange"]

JOC1 -> DATABASE1
JOC2 -> DATABASE2
JOC3 -> DATABASE3

JOC1 -> BRANCH1 [label="   Commit/Push\nPull   "]
JOC2 -> BRANCH2 [label="   Commit/Push\nPull   "]
JOC3 -> BRANCH3 [label="   Commit/Push\nPull   "]

BRANCH1 -> BRANCH2 [label="  merge   "] 
BRANCH2 -> BRANCH3 [label="   merge   "]

BRANCH1 -> REPO
BRANCH2 -> REPO
BRANCH3 -> REPO


USER1USER1a -> JOC1
USER1b -> JOC1
USER2 -> JOC2
USER3 -> JOC3

...

  • The JOC Cockpit database holds the configuration objects:
    • each JOC Cockpit instance is connected to its own database.
    • each branch is connected to one or more JOC Cockpit instance.
  • Each branch makes use of an individual version.
  • Each user (client) makes use of an individual JS7 instance using JOC Cockpit instance.and database, Controller and Agents
    • If merging of configuration objects is required then additional tools such as Git Extensions can be used.

...