Compare commits

..

No commits in common. '8064928ba4f2c52d00351ad2091a923a901572e2' and 'ad8fffcec733ecb18a172307ca28c5398639b006' have entirely different histories.

  1. 2
      .gitconfig
  2. 15
      .seeks.ccatc
  3. 12
      .seeks.odaas
  4. 266
      .spacemacs
  5. 7
      .ssh/config.oci
  6. 15
      .ssh/config.solaris
  7. 12
      .zshenv
  8. 6
      .zshrc
  9. 2
      bin/lib/logging.sh
  10. 36
      bin/ul11u4_build.sh
  11. 65
      bin/ul11u4_delivery_and_integrate.sh
  12. 15
      bin/ul11u4_gate_open.sh
  13. 65
      bin/ul11u4_integrate.sh

@ -45,5 +45,3 @@
defaultBranch = master defaultBranch = master
[webui] [webui]
autoupdate = true autoupdate = true
; [color]
; ui = auto

@ -1,15 +0,0 @@
[dep]
upgrade: ask
user_email: petr.nyc@oracle.com
[bitbucket]
username: pnyc
[templates]
project: CCATC
repo: ccatc-seeks
branch: main
vcs: SCM
scmrepo: ocid1.devopsrepository.oc1.phx.amaaaaaaw4vcxbyahrz7vgu4tdwdcfwd26e5fvmcoidmxrtmdvwyowqhi6rq
filepath: seeks_templates.conf

@ -1,12 +0,0 @@
[dep]
upgrade: ask
user_email: petr.nyc@oracle.com
[bitbucket]
username: pnyc
[templates]
project: ODAAS
repo: cm_automation
branch: main
filepath: change_templates/seeks_templates.conf

@ -32,10 +32,7 @@ This function should only modify configuration layer settings."
;; List of configuration layers to load. ;; List of configuration layers to load.
dotspacemacs-configuration-layers dotspacemacs-configuration-layers
'(swift '(nginx
yaml
themes-megapack
nginx
toml toml
html html
python python
@ -77,7 +74,6 @@ This function should only modify configuration layer settings."
;; version-control ;; version-control
treemacs treemacs
docker docker
terraform
) )
@ -95,7 +91,6 @@ This function should only modify configuration layer settings."
dotspacemacs-additional-packages '( dotspacemacs-additional-packages '(
org-mac-link org-mac-link
org-alert org-alert
;org-caldav
;org-protocol ;org-protocol
) )
@ -283,11 +278,10 @@ It should only modify the values of Spacemacs settings."
;; fixed-pitch faces. The `:size' can be specified as ;; fixed-pitch faces. The `:size' can be specified as
;; a non-negative integer (pixel size), or a floating-point (point size). ;; a non-negative integer (pixel size), or a floating-point (point size).
;; Point size is recommended, because it's device independent. (default 10.0) ;; Point size is recommended, because it's device independent. (default 10.0)
;; commented out on 30.7.2025 - seems not to have effect dotspacemacs-default-font '("Source Code Pro for Powerline"
;; dotspacemacs-default-font '("Source Code Pro for Powerline" :size 18.0
;; :height 180 :weight normal
;; :weight normal :width normal)
;; :width normal)
;; The leader key (default "SPC") ;; The leader key (default "SPC")
dotspacemacs-leader-key "SPC" dotspacemacs-leader-key "SPC"
@ -353,7 +347,7 @@ It should only modify the values of Spacemacs settings."
;; If non-nil, the paste transient-state is enabled. While enabled, after you ;; If non-nil, the paste transient-state is enabled. While enabled, after you
;; paste something, pressing `C-j' and `C-k' several times cycles through the ;; paste something, pressing `C-j' and `C-k' several times cycles through the
;; elements in the `kill-ring'. (default nil) ;; elements in the `kill-ring'. (default nil)
dotspacemacs-enable-paste-transient-state nil dotspacemacs-enable-paste-transient-state t
;; Which-key delay in seconds. The which-key buffer is the popup listing ;; Which-key delay in seconds. The which-key buffer is the popup listing
;; the commands bound to the current keystroke sequence. (default 0.4) ;; the commands bound to the current keystroke sequence. (default 0.4)
@ -598,8 +592,6 @@ This function is called immediately after `dotspacemacs/init', before layer
configuration. configuration.
It is mostly for variables that should be set before packages are loaded. It is mostly for variables that should be set before packages are loaded.
If you are unsure, try setting them in `dotspacemacs/user-config' first." If you are unsure, try setting them in `dotspacemacs/user-config' first."
;; (add-to-list 'load-path "/Users/jetpac/Documents/emacs/tramp-mirror/tramp/lisp")
) )
@ -617,33 +609,6 @@ This function is called at the very end of Spacemacs startup, after layer
configuration. configuration.
Put your configuration code here, except for variables that should be set Put your configuration code here, except for variables that should be set
before packages are loaded." before packages are loaded."
;; setting gui font for gui only
(defun my/set-gui-font ()
(when (display-graphic-p)
(set-frame-font "MesloLGS Nerd Font-18" t t)))
;; (set-frame-font "Source Code Pro for Powerline-18" t t)))
(add-hook 'after-make-frame-functions
(lambda (frame)
(select-frame frame)
(my/set-gui-font)))
;; Also apply font immediately if current frame is GUI
(my/set-gui-font)
;; end of setting gui font
;; (require 'tramp)
;; for 24bit colors to work (and extra themes), use TERM=xterm-24bit
;; as described at https://github.com/syl20bnr/spacemacs/wiki/Terminal
;; for pandoc to work
(add-to-list 'exec-path "/opt/homebrew/bin")
(setenv "PATH" (concat "/opt/homebrew/bin:" (getenv "PATH")))
;; Proxy toggle function ;; Proxy toggle function
(setq http_proxy "http://www-proxy.uk.oracle.com:80") (setq http_proxy "http://www-proxy.uk.oracle.com:80")
(defun toggle-proxy () (defun toggle-proxy ()
@ -667,7 +632,7 @@ before packages are loaded."
(defun set-dotfiles-environment () (defun set-dotfiles-environment ()
"Set environment variables for the dotfiles repository." "Set environment variables for the dotfiles repository."
(interactive) (interactive)
(setenv "GIT_DIR" (expand-file-name "~/.cfg/")) (setenv "GIT_DIR" (expand-file-name "~/.cfg/.git"))
(setenv "GIT_WORK_TREE" (expand-file-name "~")) (setenv "GIT_WORK_TREE" (expand-file-name "~"))
(message "Dotfiles environment set.")) (message "Dotfiles environment set."))
@ -695,56 +660,6 @@ before packages are loaded."
(setq org-duration-format 'h:mm) (setq org-duration-format 'h:mm)
;; ================================================================================
;; config for org-caldav for my nextcloud installation
;; not working to my satisfaction yet - only configured for not used files
;; inspiration from https://www.reddit.com/r/orgmode/comments/8rl8ep/making_orgcaldav_useable/
;; doc: https://github.com/dengste/org-caldav
;; URL of the caldav server
(setq org-caldav-url "https://next.cloud.jetpac.org/remote.php/dav/calendars/jetpac")
(setq org-caldav-calendars
'((:calendar-id "personal"
:files ("~/Documents/org/synced_calendar.org")
;; :inbox ("~/Documents/org/caldav/from-calendar.org")
;; :sync-direction ('org->cal)
))
)
;; config
(setq org-icalendar-alarm-time 1)
;; This makes sure to-do items as a category can show up on the calendar
(setq org-icalendar-include-todo t)
;; This ensures all org "deadlines" show up, and show up as due dates
(setq org-icalendar-use-deadline '(event-if-todo event-if-not-todo todo-due))
;; This ensures "scheduled" org items show up, and show up as start times
(setq org-icalendar-use-scheduled '(todo-start event-if-todo event-if-not-todo))
(setq org-caldav-backup-file "~/Documents/org/caldav/org-caldav-backup.org")
(setq org-caldav-save-directory "~/Documents/org/caldav/")
;; ;; calendar ID on server
;; (setq org-caldav-calendar-id "personal")
;; ;; Org filename where new entries from calendar stored
(setq org-caldav-inbox "~/Documents/org/caldav/from-calendar.org")
;; ;; Additional Org files to check for calendar events
;; ;; this line breaks the sync!
;; (setq org-caldav-files ("~/Documents/org/caldav/todo.org"))
;; ;; (setq org-caldav-files nil)
;; ;; Usually a good idea to set the timezone manually
;; (setq org-icalendar-timezone "Europe/Prague")
;; ;; sync from org to cal only
;; (setq org-caldav-sync-direction "org->cal")
;; ;; (setq org-caldav-sync-direction "twoway")
;; ================================================================================
;; Define the custum capture templates ;; Define the custum capture templates
(setq org-capture-templates (setq org-capture-templates
'(("t" "Todo [inbox] clock_in clock_resume " entry (file+headline org-default-notes-file "Tasks") '(("t" "Todo [inbox] clock_in clock_resume " entry (file+headline org-default-notes-file "Tasks")
@ -770,9 +685,7 @@ before packages are loaded."
(setq org-agenda-files '("~/Documents/org/inbox.org" (setq org-agenda-files '("~/Documents/org/inbox.org"
"~/Documents/org/projects.org" "~/Documents/org/projects.org"
"~/Documents/org/someday.org" "~/Documents/org/someday.org"
"~/Documents/org/calendar.org" "~/Documents/org/calendar.org"))
"~/Documents/org/synced_calendar.org"
))
@ -856,52 +769,6 @@ before packages are loaded."
(if (string= (match-string 1) " ") (if (string= (match-string 1) " ")
"x" " ") nil nil nil 1)))) "x" " ") nil nil nil 1))))
(setq warning-minimum-level :error)
;; 28.4. - terminal clipboard integration
;; (when (and (not (display-graphic-p))
;; (eq system-type 'darwin))
;; (defun copy-to-mac-clipboard (text &optional push)
;; (let ((process-connection-type nil))
;; (let ((proc (start-process "pbcopy" "*Messages*" "pbcopy")))
;; (process-send-string proc text)
;; (process-send-eof proc))))
;; (defun paste-from-mac-clipboard ()
;; (shell-command-to-string "pbpaste"))
;; (setq interprogram-cut-function 'copy-to-mac-clipboard)
;; (setq interprogram-paste-function 'paste-from-mac-clipboard))
;; terminal clipboard that should also work on remote systems
(defun my/set-clipboard-integration ()
(cond
;; macOS in terminal (non-GUI mode) – use pbcopy/pbpaste
((and (eq system-type 'darwin)
(not (display-graphic-p)))
(defun copy-to-mac-clipboard (text &optional push)
(let ((process-connection-type nil))
(let ((proc (start-process "pbcopy" "*Messages*" "pbcopy")))
(process-send-string proc text)
(process-send-eof proc))))
(defun paste-from-mac-clipboard ()
(shell-command-to-string "pbpaste"))
(setq interprogram-cut-function 'copy-to-mac-clipboard)
(setq interprogram-paste-function 'paste-from-mac-clipboard))
;; All other non-GUI modes (e.g., tmux, remote SSH) – use OSC 52
((not (display-graphic-p))
(defun copy-to-osc52 (text &optional push)
(let ((osc52 (concat "\e]52;c;" (base64-encode-string text t) "\a")))
(send-string-to-terminal osc52)))
(setq interprogram-cut-function 'copy-to-osc52)
;; paste not supported with OSC 52, leave interprogram-paste-function nil
(message "Using OSC 52 for clipboard integration"))))
(my/set-clipboard-integration)
) ;; user-config ) ;; user-config
@ -917,84 +784,53 @@ This function is called at the very end of Spacemacs initialization."
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(custom-enabled-themes '(spacemacs-dark))
'(custom-safe-themes
'("7fea145741b3ca719ae45e6533ad1f49b2a43bf199d9afaee5b6135fd9e6f9b8"
"810691bd221e4639d5ef736b1bd930a7fb32a7c6043a5634e04f86edea973f6d"
"a0ac98a1bde5d6336295fd350155a4aac1d63c53c1b3773062271074d16ebeb5"
"bbb13492a15c3258f29c21d251da1e62f1abb8bbd492386a673dcfab474186af"
"7fd8b914e340283c189980cd1883dbdef67080ad1a3a9cc3df864ca53bdc89cf" default))
'(package-selected-packages '(package-selected-packages
'(a ace-jump-helm-line ace-link afternoon-theme aggressive-indent aio '(a ace-jump-helm-line ace-link aggressive-indent aio alert all-the-icons
alect-themes alert all-the-icons ample-theme ample-zen-theme anaconda-mode auto-compile auto-highlight-symbol auto-yasnippet blacken
anaconda-mode anti-zenburn-theme apropospriate-theme auto-compile bui centered-cursor-mode clean-aindent-mode closql code-cells code-review
auto-highlight-symbol auto-yasnippet autothemer badwolf-theme
birds-of-paradise-plus-theme blacken bubbleberry-theme bui busybee-theme
centered-cursor-mode cherry-blossom-theme chocolate-theme
clean-aindent-mode closql clues-theme code-cells code-review
color-theme-sanityinc-solarized color-theme-sanityinc-tomorrow
column-enforce-mode company company-anaconda company-box column-enforce-mode company company-anaconda company-box
company-quickhelp company-shell company-statistics company-terraform company-quickhelp company-shell company-statistics company-web concurrent
company-web concurrent ctable cyberpunk-theme cython-mode dakrone-theme ctable cython-mode dap-mode deferred define-word devdocs diminish
dap-mode darkmine-theme darkokai-theme darktooth-theme deferred dired-quick-sort disable-mouse docker dockerfile-mode dotenv-mode
define-word devdocs diminish dired-quick-sort disable-mouse django-theme drag-stuff dumb-jump edit-indirect editorconfig elisp-def elisp-demos
docker dockerfile-mode doom-themes dotenv-mode dracula-theme drag-stuff elisp-slime-nav emacsql emmet-mode emojify emr epc eval-sexp-fu evil-anzu
dumb-jump edit-indirect editorconfig ef-themes elisp-def elisp-demos evil-args evil-cleverparens evil-collection evil-easymotion evil-escape
elisp-slime-nav emacsql emmet-mode emojify emr epc espresso-theme evil-evilified-state evil-exchange evil-goggles evil-iedit-state
eval-sexp-fu evil-anzu evil-args evil-cleverparens evil-collection evil-indent-plus evil-lion evil-lisp-state evil-matchit evil-mc
evil-easymotion evil-escape evil-evilified-state evil-exchange evil-nerd-commenter evil-numbers evil-org evil-surround evil-textobj-line
evil-goggles evil-iedit-state evil-indent-plus evil-lion evil-lisp-state evil-tutor evil-unimpaired evil-visual-mark-mode evil-visualstar
evil-matchit evil-mc evil-nerd-commenter evil-numbers evil-org expand-region eyebrowse fancy-battery fish-mode flx-ido flycheck-bashate
evil-surround evil-textobj-line evil-tutor evil-unimpaired flycheck-elsa flycheck-package flycheck-pos-tip forge frame-local gh-md
evil-visual-mark-mode evil-visualstar exotica-theme expand-region
eyebrowse eziam-themes fancy-battery farmhouse-themes fish-mode
flatland-theme flatui-theme flx-ido flycheck-bashate flycheck-elsa
flycheck-package flycheck-pos-tip forge frame-local gandalf-theme gh-md
ghub git-link git-messenger git-modes git-timemachine gitignore-templates ghub git-link git-messenger git-modes git-timemachine gitignore-templates
gntp gnuplot golden-ratio google-translate gotham-theme grandshell-theme gntp gnuplot golden-ratio google-translate haml-mode helm-ag
gruber-darker-theme gruvbox-theme haml-mode hc-zenburn-theme hcl-mode helm-c-yasnippet helm-comint helm-company helm-css-scss helm-descbinds
helm-ag helm-c-yasnippet helm-comint helm-company helm-css-scss helm-git-grep helm-ls-git helm-lsp helm-make helm-mode-manager helm-org
helm-descbinds helm-git-grep helm-ls-git helm-lsp helm-make helm-org-rifle helm-projectile helm-purpose helm-pydoc helm-swoop
helm-mode-manager helm-org helm-org-rifle helm-projectile helm-purpose helm-themes helm-xref hide-comnt hierarchy highlight-indentation
helm-pydoc helm-swoop helm-themes helm-xref hemisu-theme heroku-theme highlight-numbers highlight-parentheses hl-todo holy-mode htmlize
hide-comnt hierarchy highlight-indentation highlight-numbers hungry-delete hybrid-mode impatient-mode importmagic indent-guide info+
highlight-parentheses hl-todo holy-mode htmlize hungry-delete hybrid-mode insert-shebang inspector js-doc js2-mode js2-refactor json-mode
impatient-mode importmagic indent-guide info+ inkpot-theme insert-shebang json-navigator json-reformat json-snatcher link-hint live-py-mode
inspector ir-black-theme jazz-theme jbeans-theme js-doc js2-mode livid-mode load-env-vars log4e lorem-ipsum lsp-docker lsp-mode
js2-refactor json-mode json-navigator json-reformat json-snatcher lsp-origami lsp-pyright lsp-treemacs lsp-ui macrostep magit magit-section
kaolin-themes light-soap-theme link-hint live-py-mode livid-mode markdown-mode markdown-toc multi-line multiple-cursors nameless
load-env-vars log4e lorem-ipsum lsp-docker lsp-mode lsp-origami nginx-mode nodejs-repl nose npm-mode open-junk-file org-alert
lsp-pyright lsp-treemacs lsp-ui lush-theme macrostep madhat2r-theme magit org-category-capture org-cliplink org-contrib org-download org-jira
magit-section markdown-mode markdown-toc material-theme minimal-theme org-mac-link org-mime org-pomodoro org-present org-project-capture
modus-themes moe-theme molokai-theme monochrome-theme monokai-theme org-projectile org-rich-yank org-superstar orgit orgit-forge origami
multi-line multiple-cursors mustang-theme nameless naquadah-theme overseer ox-jira ox-pandoc ox-twbs pandoc-mode paradox password-generator
nginx-mode noctilux-theme nodejs-repl nose npm-mode obsidian-theme pcre2el pip-requirements pipenv pippel poetry popwin pos-tip prettier-js
occidental-theme oldlace-theme omtose-phellack-themes open-junk-file pug-mode py-isort pydoc pyenv-mode pylookup pytest pythonic pyvenv
org-alert org-caldav org-category-capture org-cliplink org-contrib quickrun rainbow-delimiters request restart-emacs sass-mode scss-mode
org-download org-jira org-mac-link org-mime org-pomodoro org-present shfmt simple-httpd skewer-mode slim-mode smeargle space-doc spaceline
org-project-capture org-projectile org-rich-yank org-superstar spacemacs-purpose-popwin spacemacs-whitespace-cleanup sphinx-doc
organic-green-theme orgit orgit-forge origami overseer ox-jira string-edit-at-point string-inflection symbol-overlay symon tablist
ox-twbs pandoc-mode paradox password-generator pcre2el tagedit term-cursor tern toc-org toml-mode transient treemacs-evil
phoenix-dark-mono-theme phoenix-dark-pink-theme pip-requirements pipenv
pippel planet-theme poetry popwin pos-tip prettier-js professional-theme
pug-mode purple-haze-theme py-isort pydoc pyenv-mode pylookup pytest
pythonic pyvenv quickrun railscasts-theme rainbow-delimiters
rebecca-theme request restart-emacs reverse-theme sass-mode scss-mode
seti-theme shfmt simple-httpd skewer-mode slim-mode smeargle smyx-theme
soft-charcoal-theme soft-morning-theme soft-stone-theme solarized-theme
soothe-theme space-doc spacegray-theme spaceline spacemacs-purpose-popwin
spacemacs-whitespace-cleanup sphinx-doc string-edit-at-point
string-inflection subatomic-theme subatomic256-theme sublime-themes
sunny-day-theme symbol-overlay symon tablist tagedit tango-2-theme
tango-plus-theme tangotango-theme tao-theme term-cursor tern
terraform-mode toc-org toml-mode toxi-theme transient treemacs-evil
treemacs-icons-dired treemacs-magit treemacs-persp treemacs-projectile treemacs-icons-dired treemacs-magit treemacs-persp treemacs-projectile
treepy twilight-anti-bright-theme twilight-bright-theme twilight-theme treepy undo-fu undo-fu-session vi-tilde-fringe vim-powerline
ujelly-theme underwater-theme undo-fu undo-fu-session vi-tilde-fringe volatile-highlights vundo web-beautify web-completion-data web-mode
vim-powerline volatile-highlights vundo web-beautify web-completion-data which-key winum with-editor writeroom-mode ws-butler yaml yapfify
web-mode which-key white-sand-theme winum with-editor writeroom-mode yasnippet yasnippet-snippets)))
ws-butler yaml yaml-mode yapfify yasnippet yasnippet-snippets
zen-and-art-theme zenburn-theme zonokai-emacs)))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

@ -1,10 +1,3 @@
Include config-scm
Include ssh_configs/config Include ssh_configs/config
Include osd_configs/config Include osd_configs/config
Include user Include user
Host bitbucket.oci.oraclecorp.com
IdentityFile ~/.ssh/orabucket
HostkeyAlgorithms +ssh-rsa
PubkeyAcceptedAlgorithms +ssh-rsa

@ -15,27 +15,12 @@ Host *
Host 192.168.2.* Host 192.168.2.*
IdentitiesOnly yes IdentitiesOnly yes
Host gitlab.com
User git
IdentityFile ~/.ssh/gitlab
Host solaris-reviews.us.oracle.com
User hg
IdentityFile ~/.ssh/id_phabricator
Host hetzner Host hetzner
HostName u444067.your-storagebox.de HostName u444067.your-storagebox.de
User u444067 User u444067
Port 23 Port 23
IdentityFile ~/.ssh/id_hetzner IdentityFile ~/.ssh/id_hetzner
Host pnyc-ws pnyc-ws.webad1phx.solarisx86phx.oraclevcn.com
HostName pnyc-ws.webad1phx.solarisx86phx.oraclevcn.com
User opc
IdentityFile ~/.ssh/id_pnyc-ws
# ssh -i ./id_pnyc-ws opc@pnyc-ws.webad1phx.solarisx86phx.oraclevcn.com
Host osdbld Host osdbld
HostName 100.73.219.187 HostName 100.73.219.187
User opc User opc

@ -13,16 +13,6 @@ alias pig='ping'
# export PATH=$HOME/.rd/bin # export PATH=$HOME/.rd/bin
# #
# on speccy only
if [[ "$(hostname)" == "speccy" ]];
then
# defined via https://github.com/syl20bnr/spacemacs/wiki/Terminal
export TERM=xterm-24bit
alias ssh="TERM=xterm-256color ssh"
alias vi=te
alias vim=te
fi
# for gems installed in my home direcotry # for gems installed in my home direcotry
# inspiration: https://guides.cocoapods.org/using/getting-started.html#installation # inspiration: https://guides.cocoapods.org/using/getting-started.html#installation
@ -95,7 +85,7 @@ alias nextcloud-shell='k exec -n nextcloud deployments/nextcloud -c nextcloud -i
alias nextcloud-shell-root='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- bash' alias nextcloud-shell-root='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- bash'
alias occ='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- runuser --user www-data /var/www/html/occ' alias occ='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- runuser --user www-data /var/www/html/occ'
alias speech_to_text="$HOME/Downloads/whisper.cpp/convert_video_to_txt.sh" alias speech_to_text="$HOME/Downloads/whisper-cpp/convert_video_to_txt.sh"
if [ -f "/Users/jetpac/.local/bin/k9s" ]; then if [ -f "/Users/jetpac/.local/bin/k9s" ]; then

@ -113,7 +113,7 @@ COMPLETION_WAITING_DOTS="true"
# Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
plugins=(git rsync colorize colored-man-pages vi-mode common-aliases macos themes dircycle iterm2 docker docker-compose zsh-navigation-tools urltools history mercurial tmux zsh-syntax-highlighting zsh-autosuggestions kubectl helm terraform asdf brew web-search kubectl helm aliases emacs) plugins=(git rsync colorize colored-man-pages vi-mode common-aliases macos themes dircycle iterm2 docker docker-compose zsh-navigation-tools urltools history mercurial tmux zsh-syntax-highlighting zsh-autosuggestions kubectl helm terraform asdf brew web-search kubectl helm)
# consider plugin fzf - only available for Mac/Linux # consider plugin fzf - only available for Mac/Linux
@ -241,7 +241,3 @@ export PATH=$GEM_HOME/bin:$HOME/.gem/ruby/3.3.0/bin:$PATH
# Generated for envman. Do not edit. # Generated for envman. Do not edit.
# [ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh" # [ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"
# alias scm-ssh='/Users/jetpac/.ssh/scm-script.sh'
# scm-ssh start_agent

@ -5,7 +5,7 @@
trap 'exit 1' HUP INT QUIT TERM trap 'exit 1' HUP INT QUIT TERM
# trap 'on_error' EXIT trap 'on_error' EXIT
log::prefix() { log::prefix() {
date=$(/opt/homebrew/bin/gdate '+%Y-%m-%d %H:%M:%S,%3N') date=$(/opt/homebrew/bin/gdate '+%Y-%m-%d %H:%M:%S,%3N')

@ -1,34 +1,15 @@
#!/usr/bin/env bash #!/usr/bin/env bash
[[ "$0" == /* ]] && typeset -r PRG=$0 || typeset -r PRG=$PWD/$0 source lib/logging.sh
BINDIR=$(dirname "$PRG") TARGET=$1
typeset -r BINDIR
source "${BINDIR}/lib/logging.sh"
W3M=/opt/homebrew/bin/w3m if [ -z "$TARGET" ];
AWK=/usr/bin/awk
CURL=/usr/bin/curl
source "${BINDIR}/lib/logging.sh"
TARGET="${1-11.4.83.0.1.195.1}"
log::info "TARGET:${TARGET}"
URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=240&show=All&gateName=S11.4-SRU&status=4&target=${TARGET}"
log::debug $URL
output=$(/opt/homebrew/bin/w3m "$URL" -M -cols 400 -graph -dump 2>&1)
out=$(echo "$output" | $AWK '/^Details/ {found=1; next} found && NF')
if [[ -z "$out" ]];
then then
log::info "There are no queued RTIs for \"${TARGET}\". Nothing to do..." log::fatal "No target specified on command line"
exit 0
fi fi
log::info"Starting build for for Ul11u4SRU" log::info"Starting build for for Ul11u4SRU"
log::info "Target: \"${TARGET}\"" log::info "Target: \"${TARGET}\""
@ -44,21 +25,16 @@ curl -X POST "${JOB_URL}" \
--user "pnyc:${JENKINS_TOKEN}" \ --user "pnyc:${JENKINS_TOKEN}" \
--data-urlencode "Build_Label=${TARGET}" \ --data-urlencode "Build_Label=${TARGET}" \
--data-urlencode "hguser=petr.nyc@oracle.com" \ --data-urlencode "hguser=petr.nyc@oracle.com" \
--data-urlencode "dryrun=false" \
--data-urlencode "verbose=true" \ --data-urlencode "verbose=true" \
--data-urlencode "debug=true" \ --data-urlencode "debug=true" \
--data-urlencode "scriptdir=./solaris/userland/sru/" \ --data-urlencode "scriptdir=./solaris/userland/sru/" \
--data-urlencode "do_check_sru_cbe=true" \ --data-urlencode "do_check_sru_cbe=true" \
--data-urlencode "prepare_work_area=true" \ --data-urlencode "prepare_work_area=true" \
--data-urlencode "do_build=true" \ --data-urlencode "do_build=true" \
--data-urlencode "merge_repo=true" \ --data-urlencode "prepare_delivery=true" \
--data-urlencode "create_sparse_repo=true" \
--data-urlencode "check_incorporations=true" \
--data-urlencode "zip_sparse_repo=true" \
--data-urlencode "create_escrow=true" \ --data-urlencode "create_escrow=true" \
--data-urlencode "create_foss=true" \ --data-urlencode "create_foss=true" \
--data-urlencode "integration_dryrun=false" \
--data-urlencode "confirm_before_ingegration=false" \
--data-urlencode "wait_for_dock_open=true" \
--data-urlencode "delivery=true" --data-urlencode "delivery=true"
log::info "The job will be started here:" log::info "The job will be started here:"

@ -1,65 +0,0 @@
#!/usr/bin/env bash
[[ "$0" == /* ]] && typeset -r PRG=$0 || typeset -r PRG=$PWD/$0
BINDIR=$(dirname "$PRG")
typeset -r BINDIR
source "${BINDIR}/lib/logging.sh"
W3M=/opt/homebrew/bin/w3m
AWK=/usr/bin/awk
CURL=/usr/bin/curl
source "${BINDIR}/lib/logging.sh"
TARGET="${1-11.4.83.0.1.195.1}"
log::info "TARGET:${TARGET}"
URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=240&show=All&gateName=S11.4-SRU&status=4&target=${TARGET}"
log::debug $URL
output=$(/opt/homebrew/bin/w3m "$URL" -M -cols 400 -graph -dump 2>&1)
out=$(echo "$output" | $AWK '/^Details/ {found=1; next} found && NF')
if [[ -z "$out" ]];
then
log::info "There are no queued RTIs for \"${TARGET}\". Nothing to do..."
exit 0
fi
log::info "Starting build for for Ul11u4SRU"
log::info "Target: \"${TARGET}\""
JENKINS_TOKEN='1154eb0158729a7d326c1db13e7dca0cea'
JENKINS_SERVER='http://mrshughes.us.oracle.com/jenkins/'
JOB_URL="${JENKINS_SERVER}/job/Solaris_11/job/11.4/job/userland-sru/job/userland-sru-build-11.4/buildWithParameters"
log::info "Using '${JOB_URL}'"
set -x
curl -X POST "${JOB_URL}" \
--user "pnyc:${JENKINS_TOKEN}" \
--data-urlencode "Build_Label=${TARGET}" \
--data-urlencode "hguser=petr.nyc@oracle.com" \
--data-urlencode "verbose=true" \
--data-urlencode "debug=true" \
--data-urlencode "scriptdir=./solaris/userland/sru/" \
--data-urlencode "do_check_sru_cbe=false" \
--data-urlencode "prepare_work_area=false" \
--data-urlencode "do_build=false" \
--data-urlencode "merge_repo=true" \
--data-urlencode "create_sparse_repo=true" \
--data-urlencode "check_incorporations=true" \
--data-urlencode "zip_sparse_repo=true" \
--data-urlencode "create_escrow=true" \
--data-urlencode "create_foss=true" \
--data-urlencode "integration_dryrun=false" \
--data-urlencode "confirm_before_ingegration=false" \
--data-urlencode "wait_for_dock_open=true" \
--data-urlencode "delivery=true"
log::info "The job will be started here:"
log::info " ${JOB_URL%%buildWith*}"

@ -1,7 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# set -x
[[ "$0" == /* ]] && typeset -r PRG=$0 || typeset -r PRG=$PWD/$0 [[ "$0" == /* ]] && typeset -r PRG=$0 || typeset -r PRG=$PWD/$0
BINDIR=$(dirname "$PRG") BINDIR=$(dirname "$PRG")
@ -13,21 +11,14 @@ CURL=/usr/bin/curl
source "${BINDIR}/lib/logging.sh" source "${BINDIR}/lib/logging.sh"
TARGET="${1-11.4.84.0.1.201.1}" TARGET="${1-11.4.81.0.1.195.1}"
log::info "TARGET:${TARGET}"
URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=240&show=All&gateName=S11.4-SRU&status=1&target=${TARGET}"
log::debug $URL
output=$(/opt/homebrew/bin/w3m "$URL" -M -cols 400 -graph -dump 2>&1) URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=20&show=All&gateName=S11.4-SRU&status=1&target=${TARGET}"
out=$(echo "$output" | awk '/^Details.*Consolidation/ {found=1; next} found') out=$($W3M "$URL" -M -cols 400 -graph -dump | $AWK '/^Details/ {found=1; next} found && NF')
if [[ -z "$out" ]]; if [[ -z "$out" ]];
then then
# log::debug "output: ### $out ###"
log::info "There are no queued RTIs for \"${TARGET}\". Nothing to do..." log::info "There are no queued RTIs for \"${TARGET}\". Nothing to do..."
exit 0 exit 0
fi fi

@ -1,65 +0,0 @@
#!/usr/bin/env bash
[[ "$0" == /* ]] && typeset -r PRG=$0 || typeset -r PRG=$PWD/$0
BINDIR=$(dirname "$PRG")
typeset -r BINDIR
source "${BINDIR}/lib/logging.sh"
W3M=/opt/homebrew/bin/w3m
AWK=/usr/bin/awk
CURL=/usr/bin/curl
source "${BINDIR}/lib/logging.sh"
TARGET="${1-11.4.83.0.1.195.1}"
log::info "TARGET:${TARGET}"
URL="http://grt.us.oracle.com/grt/webservice/grtList/?gate=240&show=All&gateName=S11.4-SRU&status=4&target=${TARGET}"
log::debug $URL
output=$(/opt/homebrew/bin/w3m "$URL" -M -cols 400 -graph -dump 2>&1)
out=$(echo "$output" | $AWK '/^Details/ {found=1; next} found && NF')
if [[ -z "$out" ]];
then
log::info "There are no queued RTIs for \"${TARGET}\". Nothing to do..."
exit 0
fi
log::info "Starting build for for Ul11u4SRU"
log::info "Target: \"${TARGET}\""
JENKINS_TOKEN='1154eb0158729a7d326c1db13e7dca0cea'
JENKINS_SERVER='http://mrshughes.us.oracle.com/jenkins/'
JOB_URL="${JENKINS_SERVER}/job/Solaris_11/job/11.4/job/userland-sru/job/userland-sru-build-11.4/buildWithParameters"
log::info "Using '${JOB_URL}'"
set -x
curl -X POST "${JOB_URL}" \
--user "pnyc:${JENKINS_TOKEN}" \
--data-urlencode "Build_Label=${TARGET}" \
--data-urlencode "hguser=petr.nyc@oracle.com" \
--data-urlencode "verbose=true" \
--data-urlencode "debug=true" \
--data-urlencode "scriptdir=./solaris/userland/sru/" \
--data-urlencode "do_check_sru_cbe=false" \
--data-urlencode "prepare_work_area=false" \
--data-urlencode "do_build=false" \
--data-urlencode "merge_repo=false" \
--data-urlencode "create_sparse_repo=false" \
--data-urlencode "check_incorporations=false" \
--data-urlencode "zip_sparse_repo=false" \
--data-urlencode "create_escrow=false" \
--data-urlencode "create_foss=false" \
--data-urlencode "integration_dryrun=false" \
--data-urlencode "confirm_before_ingegration=false" \
--data-urlencode "wait_for_dock_open=true" \
--data-urlencode "delivery=true"
log::info "The job will be started here:"
log::info " ${JOB_URL%%buildWith*}"
Loading…
Cancel
Save