Versions Compared

Key

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

...

  • The scenario is described with the JS7 - Git Repository Interface.
  • CI/CD includes to perform the following steps
    • in a test environment
      • to store scheduling objects of a JOC Cockpit inventory to a local Git repository,
      • to commit and to push changes to the remote Git repository.
    • in a prod environment
      • to copy changes from the remote test Git repository to the remote prod Git repository,
      • to pull changes from the remote prod Git repository to the local Git repository,
      • to update the JOC Cockpit inventory from the local Git repository,
      • to release and to deploy scheduling objects to Controllers and Agents.

...

Steps to perform in the PROD Environment

Copy Changes from TEST to PROD Git Repository

There are a number of ways how to do this:

Code Block
languagepowershell
titleExample how to pull changes to a local Git repository
linenumberstrue
# add the old repo as a remote repository 
git remote add oldrepo https://github.com/path/to/oldrepo

# get the old repo commits
git remote update

# examine the whole tree
git log --all --oneline --graph --decorate

# copy (cherry-pick) the commits from the old repo into your new local one
git cherry-pick sha-of-commit-one
git cherry-pick sha-of-commit-two
git cherry-pick sha-of-commit-three

# check your local repo is correct
git log

# send your new tree (repo state) to github
git push origin master

# remove the now-unneeded reference to oldrepo
git remote remove oldrepo

Pull Changes to local Git Repository

...