Merge "Clean obsolete barometer jobs"
authorCedric Ollivier <cedric.ollivier@orange.com>
Tue, 17 Jan 2023 18:22:10 +0000 (18:22 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 17 Jan 2023 18:22:10 +0000 (18:22 +0000)
17 files changed:
jjb/global/releng-macros.yaml
jjb/kuberef/kuberef-verify-jobs.yaml
jjb/nfvbench/nfvbench.yaml
jjb/opnfvdocs/opnfvdocs.yaml
jjb/releng/artifact-cleanup.yaml [deleted file]
jjb/releng/opnfv-lint.yaml [deleted file]
jjb/releng/opnfv-utils.yaml [deleted file]
jjb/releng/releng-jobs.yaml
releases/nile/thoth.yaml [moved from utils/build-server-ansible/vars/docker-compose-CentOS.yml with 59% similarity]
releases/nile/vineperf.yaml
utils/build-server-ansible/inventory.ini [deleted file]
utils/build-server-ansible/main.yml [deleted file]
utils/build-server-ansible/vars/CentOS.yml [deleted file]
utils/build-server-ansible/vars/Ubuntu.yml [deleted file]
utils/build-server-ansible/vars/defaults.yml [deleted file]
utils/build-server-ansible/vars/docker-compose-Ubuntu.yml [deleted file]
utils/retention_script.sh

index 8a8bbaf..89effa1 100644 (file)
       - upload-under-review-docs-to-opnfv-artifacts
       - report-build-result-to-gerrit
 
-- builder:
-    name: lint-init
-    builders:
-      - shell: |
-          #!/bin/bash
-          # Ensure we start with a clean environment
-          rm -f bash-violation.log python-violation.log yaml-violation.log violation.log
-          git --no-pager diff --diff-filter=MCRAT --name-only HEAD^1 > modified_files
-
-- builder:
-    name: lint-report
-    builders:
-      - shell: |
-          #!/bin/bash
-          if [[ -s violation.log ]]; then
-              cat violation.log
-              echo "Reporting lint result...."
-              set -x
-              msg="Found syntax error and/or coding style violation(s) in the files modified by your patchset."
-              sed -i -e "1s#^#${msg}\n\n#" violation.log
-              cmd="gerrit review -p $GERRIT_PROJECT -m \"$(cat violation.log)\" $GERRIT_PATCHSET_REVISION --notify NONE"
-              ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' -p 29418 jenkins-ci@gerrit.opnfv.org "$cmd"
-
-              # Make sure the caller job failed
-              exit 1
-          fi
-
-- builder:
-    name: lint-bash-code
-    builders:
-      - shell: |
-          #!/bin/bash
-          echo "Checking bash code..."
-          for f in $(egrep '\.sh$' modified_files)
-          do
-              bash -n "$f" 2>> bash-violation.log
-          done
-          if [[ -s bash-violation.log ]]; then
-              echo -e "Bash syntax error(s)\n---" >> violation.log
-              sed -e 's/^/ /g' bash-violation.log >> violation.log
-          fi
-
-- builder:
-    name: lint-python-code
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
-          sudo DEBIAN_FRONTEND=noninteractive apt-get \
-            -o DPkg::Lock::Timeout=300 dist-upgrade -y
-          sudo DEBIAN_FRONTEND=noninteractive \
-          apt-get -o DPkg::Lock::Timeout=300 install flake8 -y
-
-          echo "Checking python code..."
-          for f in $(egrep '\.py$' modified_files)
-          do
-              flake8 "$f" >> python-violation.log
-          done
-          if [[ -s python-violation.log ]]; then
-              echo -e "Python violation(s)\n---" >> violation.log
-              sed -e 's/^/ /g' python-violation.log >> violation.log
-          fi
-
-- builder:
-    name: lint-yaml-code
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
-          sudo DEBIAN_FRONTEND=noninteractive apt-get \
-            -o DPkg::Lock::Timeout=300 dist-upgrade -y
-          sudo DEBIAN_FRONTEND=noninteractive \
-          apt-get -o DPkg::Lock::Timeout=300 install yamllint -y
-
-          echo "Checking yaml file..."
-          for f in $(egrep '\.ya?ml$' modified_files)
-          do
-              yamllint "$f" >> yaml-violation.log
-          done
-          if [[ -s yaml-violation.log ]]; then
-              echo -e "YAML violation(s)\n---" >> violation.log
-              sed -e 's/^/ /g' yaml-violation.log >> violation.log
-          fi
-
-- builder:
-    name: lint-all-code
-    builders:
-      - lint-init
-      - lint-bash-code
-      - lint-python-code
-      - lint-yaml-code
-      - lint-report
-
 - builder:
     name: clean-workspace
     builders:
index 92f29d0..cc55b1d 100644 (file)
@@ -5,9 +5,6 @@
     stream:
       - master:
           branch: '{stream}'
-      - jerma: &jerma
-          branch: 'stable/{stream}'
-          disabled: false
     jobs:
       - '{project}-verify-lint-{stream}'
 
index 5fd994d..0976b85 100644 (file)
           gs-pathname: ''
           docker-tag: 'latest'
           disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          docker-tag: 'stable'
-          disabled: false
 
 - parameter:
     name: nfvbench-parameter
index a963d77..3047a74 100644 (file)
 ---
-########################
-# Job configuration for opnfvdocs
-########################
-- project:
-
-    name: opnfvdocs
-
-    project: '{name}'
-
-    jobs:
-      - 'opnfvdocs-verify-shellcheck-{stream}'
-      - 'opnfvdocs-merge-shellcheck-{stream}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - nile:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-
-########################
-# job templates
-########################
-
-- job-template:
-    name: 'opnfvdocs-verify-shellcheck-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-      - string:
-          name: GIT_CLONE_BASE
-          default: ssh://gerrit.opnfv.org:29418
-          description: "Used for overriding the GIT URL coming from parameters macro."
-      - 'opnfv-build-defaults'
-
+- scm:
+    name: opnfvdocs-scm
     scm:
-      - git-scm-gerrit
-
+      - git:
+          url: 'https://gerrit.opnfv.org/gerrit/opnfvdocs'
+          refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+          branches:
+            - '{ref}'
+
+- builder:
+    name: opnfvdocs-lint-bash-code
+    builders:
+      - shell: |
+          #!/bin/bash
+          echo "Checking bash code..."
+          for f in $(egrep '\.sh$' modified_files)
+          do
+              bash -n "$f" 2>> bash-violation.log
+          done
+          if [[ -s bash-violation.log ]]; then
+              echo -e "Bash syntax error(s)\n---" >> violation.log
+              sed -e 's/^/ /g' bash-violation.log >> violation.log
+          fi
+
+- trigger:
+    name: opnfvdocs-patchset-created
     triggers:
       - gerrit:
-          server-name: 'gerrit.opnfv.org'
           trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
+            - patchset-created-event
             - comment-added-contains-event:
                 comment-contains-value: 'recheck'
             - comment-added-contains-event:
                 comment-contains-value: 'reverify'
           projects:
-            - project-compare-type: 'REG_EXP'
-              project-pattern: '{project}'
+            - project-compare-type: 'ANT'
+              project-pattern: 'opnfvdocs'
               branches:
                 - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - lint-bash-code
+                  branch-pattern: master
+                - branch-compare-type: 'ANT'
+                  branch-pattern: stable/nile
 
 - job-template:
-    name: 'opnfvdocs-merge-shellcheck-{stream}'
-
-    disabled: '{obj:disabled}'
-
+    name: opnfvdocs-verify-shellcheck
     parameters:
-      - project-parameter:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-      - string:
-          name: GIT_CLONE_BASE
-          default: ssh://gerrit.opnfv.org:29418
-          description: "Used for overriding the GIT URL coming from parameters macro."
-      - string:
-          name: GS_URL
-          default: '$GS_BASE{gs-pathname}'
-          description: "Directory where the build artifact will be located upon\
-            \ the completion of the build."
-      - 'opnfv-build-defaults'
-
+      - label:
+          name: node
+          default: opnfv-build
     scm:
-      - git-scm
-
+      - opnfvdocs-scm:
+          ref: $GERRIT_REFSPEC
     triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'REG_EXP'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-
+      - opnfvdocs-patchset-created
     builders:
-      - lint-bash-code
+      - opnfvdocs-lint-bash-code
+
+- project:
+    name: opnfvdocs
+    jobs:
+      - opnfvdocs-verify-shellcheck
diff --git a/jjb/releng/artifact-cleanup.yaml b/jjb/releng/artifact-cleanup.yaml
deleted file mode 100644 (file)
index f64650b..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- project:
-    name: releng-artifact-cleanup
-
-    project: 'releng'
-
-    jobs:
-      - 'releng-artifact-cleanup-daily-{stream}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-
-
-- job-template:
-    name: 'releng-artifact-cleanup-daily-{stream}'
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-    disabled: false
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - opnfv-build-defaults
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: 'H H * * *'
-
-    builders:
-      - shell: |
-          $WORKSPACE/utils/retention_script.sh
diff --git a/jjb/releng/opnfv-lint.yaml b/jjb/releng/opnfv-lint.yaml
deleted file mode 100644 (file)
index 1733915..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
----
-########################
-# Job configuration for opnfv-lint
-########################
-- project:
-
-    name: opnfv-lint
-
-    project: opnfv-lint
-
-    jobs:
-      - 'opnfv-lint-verify-{stream}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - fraser:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - danube:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-
-########################
-# job templates
-########################
-
-- job-template:
-    name: 'opnfv-lint-verify-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    parameters:
-      - project-parameter:
-          project: $GERRIT_PROJECT
-          branch: '{branch}'
-      - node:
-          name: SLAVE_NAME
-          description: Slaves to execute yamllint
-          default-slaves:
-            - lf-build6
-          allowed-multiselect: true
-          ignore-offline-nodes: true
-
-    scm:
-      - git-scm-gerrit
-
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-          projects:
-            - project-compare-type: 'REG_EXP'
-              project-pattern: 'releng'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: '**/*.py'
-                - compare-type: ANT
-                  pattern: '**/*.sh'
-                - compare-type: ANT
-                  pattern: '**/*.yml'
-                - compare-type: ANT
-                  pattern: '**/*.yaml'
-
-    builders:
-      - lint-all-code
diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml
deleted file mode 100644 (file)
index 4a81c43..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
----
-- project:
-
-    name: opnfv-utils
-
-    jobs:
-      - 'prune-docker-images'
-      - 'check-status-of-slaves'
-      - 'ansible-build-server'
-      - 'generate-artifacts-index-pages'
-
-########################
-# job templates
-########################
-- job-template:
-    name: 'prune-docker-images'
-
-    disabled: false
-
-    concurrent: true
-
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: Slaves to prune docker images
-          default-slaves:
-            - lf-build6
-          allowed-multiselect: true
-          ignore-offline-nodes: true
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      # yamllint disable rule:line-length
-      - shell: |
-          #!/bin/bash
-          sudo systemctl restart docker
-          (docker ps -q; docker ps -aq) | sort | uniq -u | xargs --no-run-if-empty docker rm
-          docker images -f dangling=true -q | xargs --no-run-if-empty docker rmi
-
-
-    # yamllint enable rule:line-length
-    triggers:
-      - timed: '@midnight'
-
-- job-template:
-    name: 'check-status-of-slaves'
-
-    disabled: false
-    concurrent: true
-
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'script lives on master node'
-          default-slaves:
-            - lf-build6
-          allowed-multiselect: false
-          ignore-offline-nodes: true
-      - project-parameter:
-          project: releng
-          branch: master
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: '@midnight'
-
-    builders:
-      - shell: |
-          cd $WORKSPACE/utils/
-          bash slave-monitor-0.1.sh
-
-- job-template:
-    name: 'ansible-build-server'
-
-    project-type: freestyle
-
-    disabled: true
-    concurrent: true
-
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: Build Servers
-          default-slaves:
-            - lf-build6
-          allowed-multiselect: true
-          ignore-offline-nodes: true
-      - project-parameter:
-          project: releng
-          branch: master
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: '@midnight'
-
-    builders:
-      - description-setter:
-          description: '$NODE_NAME'
-      - install-ansible
-      - run-ansible-build-server-playbook
-
-
-- builder:
-    name: install-ansible
-    builders:
-      - shell: |
-          # Install ansible here
-          if [ -f /etc/centos-release ] \
-          || [ -f /etc/redhat-release ] \
-          || [ -f /etc/system-release ]; then
-          sudo yum -y install ansible
-          fi
-          if [ -f /etc/debian_version ] \
-          || grep -qi ubuntu /etc/lsb-release \
-          || grep -qi ubuntu /etc/os-release; then
-          sudo apt-get -y install ansible
-          fi
-
-
-- builder:
-    name: run-ansible-build-server-playbook
-    builders:
-      - shell: |
-          # run playbook
-          sudo ansible-playbook -i \
-          $WORKSPACE/utils/build-server-ansible/inventory.ini \
-          $WORKSPACE/utils/build-server-ansible/main.yml
-
-
-- job-template:
-    name: 'generate-artifacts-index-pages'
-
-    project-type: freestyle
-
-    disabled: false
-
-    concurrent: false
-
-    parameters:
-      - node:
-          name: SLAVE_NAME
-          description: Build Servers
-          default-slaves:
-            - lf-build6
-      - project-parameter:
-          project: releng
-          branch: master
-
-    scm:
-      - git-scm
-
-    triggers:
-      - timed: '@hourly'
-
-    builders:
-      - generate-artifact-html
-
-
-- builder:
-    name: generate-artifact-html
-    builders:
-      - shell: |
-          cd $WORKSPACE/utils/
-          ./artifacts.opnfv.org.sh
index 9c2282f..d8c4b30 100644 (file)
 
 - job-template:
     name: 'releng-release-{stream}-merge'
-    triggers:
-      - releng-patchset-merged
     scm:
       - releng-scm:
           ref: $GERRIT_REFSPEC
             python3-ruamel.yaml  -y
       - shell: !include-raw-escape:
           - branch-or-tag.sh
+
+- builder:
+    name: lint-init
+    builders:
+      - shell: |
+          #!/bin/bash
+          # Ensure we start with a clean environment
+          rm -f bash-violation.log python-violation.log yaml-violation.log violation.log
+          git --no-pager diff --diff-filter=MCRAT --name-only HEAD^1 > modified_files
+
+- builder:
+    name: lint-report
+    builders:
+      - shell: |
+          #!/bin/bash
+          if [[ -s violation.log ]]; then
+              cat violation.log
+              echo "Reporting lint result...."
+              set -x
+              msg="Found syntax error and/or coding style violation(s) in the files modified by your patchset."
+              sed -i -e "1s#^#${msg}\n\n#" violation.log
+              cmd="gerrit review -p $GERRIT_PROJECT -m \"$(cat violation.log)\" $GERRIT_PATCHSET_REVISION --notify NONE"
+              ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' -p 29418 jenkins-ci@gerrit.opnfv.org "$cmd"
+
+              # Make sure the caller job failed
+              exit 1
+          fi
+
+- builder:
+    name: lint-bash-code
+    builders:
+      - shell: |
+          #!/bin/bash
+          echo "Checking bash code..."
+          for f in $(egrep '\.sh$' modified_files)
+          do
+              bash -n "$f" 2>> bash-violation.log
+          done
+          if [[ -s bash-violation.log ]]; then
+              echo -e "Bash syntax error(s)\n---" >> violation.log
+              sed -e 's/^/ /g' bash-violation.log >> violation.log
+          fi
+
+- builder:
+    name: lint-python-code
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get -o DPkg::Lock::Timeout=300 install flake8 -y
+
+          echo "Checking python code..."
+          for f in $(egrep '\.py$' modified_files)
+          do
+              flake8 "$f" >> python-violation.log
+          done
+          if [[ -s python-violation.log ]]; then
+              echo -e "Python violation(s)\n---" >> violation.log
+              sed -e 's/^/ /g' python-violation.log >> violation.log
+          fi
+
+- builder:
+    name: lint-yaml-code
+    builders:
+      - shell: |
+          #!/bin/bash
+
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get -o DPkg::Lock::Timeout=300 install yamllint -y
+
+          echo "Checking yaml file..."
+          for f in $(egrep '\.ya?ml$' modified_files)
+          do
+              yamllint "$f" >> yaml-violation.log
+          done
+          if [[ -s yaml-violation.log ]]; then
+              echo -e "YAML violation(s)\n---" >> violation.log
+              sed -e 's/^/ /g' yaml-violation.log >> violation.log
+          fi
+
+- builder:
+    name: lint-all-code
+    builders:
+      - lint-init
+      - lint-bash-code
+      - lint-python-code
+      - lint-yaml-code
+      - lint-report
+
+- project:
+    name: releng-lint
+    jobs:
+      - 'releng-lint-verify'
+
+- job-template:
+    name: 'releng-lint-verify'
+    parameters:
+      - releng-jjb-node:
+          node: opnfv-build
+    scm:
+      - releng-scm:
+          ref: $GERRIT_REFSPEC
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event
+            - comment-added-contains-event:
+                comment-contains-value: recheck
+            - comment-added-contains-event:
+                comment-contains-value: reverify
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: 'master'
+              file-paths:
+                - compare-type: ANT
+                  pattern: '**/*.py'
+                - compare-type: ANT
+                  pattern: '**/*.sh'
+                - compare-type: ANT
+                  pattern: '**/*.yml'
+                - compare-type: ANT
+                  pattern: '**/*.yaml'
+    builders:
+      - lint-all-code
+
+- project:
+    name: releng-generate-artifacts-index-pages
+    jobs:
+      - releng-generate-artifacts-index-pages
+
+- job-template:
+    name: releng-generate-artifacts-index-pages
+    scm:
+      - releng-scm:
+          ref: master
+    parameters:
+      - releng-jjb-node:
+          node: opnfv-build
+    triggers:
+      - timed: '@daily'
+    builders:
+      - generate-artifact-html
+
+- builder:
+    name: generate-artifact-html
+    builders:
+      - shell: |
+          curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
+          echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee \
+            /etc/apt/sources.list.d/google-cloud-sdk.list
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install \
+            google-cloud-sdk s4cmd -y
+          cd $WORKSPACE/utils/
+          ./artifacts.opnfv.org.sh
+
+- project:
+    name: releng-artifact-cleanup
+    jobs:
+      - releng-artifact-cleanup
+
+- job-template:
+    name: releng-artifact-cleanup
+    scm:
+      - releng-scm:
+          ref: master
+    parameters:
+      - releng-jjb-node:
+          node: opnfv-build
+    triggers:
+      - timed: '@daily'
+    builders:
+      - releng-artifact-cleanup
+
+- builder:
+    name: releng-artifact-cleanup
+    builders:
+      - shell: |
+          curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
+          echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee \
+            /etc/apt/sources.list.d/google-cloud-sdk.list
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install \
+            google-cloud-sdk s4cmd -y
+          $WORKSPACE/utils/retention_script.sh
similarity index 59%
rename from utils/build-server-ansible/vars/docker-compose-CentOS.yml
rename to releases/nile/thoth.yaml
index fc4bcba..59d8c9e 100644 (file)
@@ -1,12 +1,17 @@
-#############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2021 The Linux Foundation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-- name: Ensure docker compose is installed.
-  yum:
-    name: 'docker-compose'
-    state: present
+project: thoth
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/nile
+    location:
+      thoth: 3b4fa67222bd3e33cb921869395b46193d353bb1
index 4a3ef2d..8825279 100644 (file)
@@ -14,4 +14,4 @@ release-model: stable
 branches:
   - name: stable/nile
     location:
-      vineperf: 34147ac299351c44d4f7d135892457fba38a132b
+      vineperf: e0b5af5ab0a36bb63c880b9137dd02e26e4c94cc
diff --git a/utils/build-server-ansible/inventory.ini b/utils/build-server-ansible/inventory.ini
deleted file mode 100644 (file)
index 115b130..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-localhost              ansible_connection=local
diff --git a/utils/build-server-ansible/main.yml b/utils/build-server-ansible/main.yml
deleted file mode 100644 (file)
index a4d3b08..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#############################################################################
----
-- hosts: "localhost"
-  become: "True"
-  tasks:
-    - debug:
-        msg: "{{ inventory_hostname }} is {{ ansible_distribution }}"
-    - include_vars: vars/defaults.yml
-    - include: vars/CentOS.yml
-      when: ansible_distribution == "CentOS"
-    - include: vars/Ubuntu.yml
-      when: ansible_distribution == "Ubuntu"
-    - name: Install Docker.
-      package: name={{ docker_package }} state={{ docker_package_state }}
-    - name: Ensure Docker is started and enabled at boot.
-      service:
-        name: docker
-        state: started
-        enabled: "yes"
-    - name: install gsutil
-      pip:
-        name: gsutil
-        state: present
-    - name: install tox
-      pip:
-        name: tox
-        state: present
-    - name: install yamllint
-      pip:
-        name: yamllint
-        state: present
-    - include: vars/docker-compose-CentOS.yml
-      when: ansible_distribution == "CentOS"
-    - include: vars/docker-compose-Ubuntu.yml
-      when: ansible_distribution == "Ubuntu"
-    - name: Install manifest-tool
-      get_url:
-        url: '{{ manifest_tool_url }}/{{ manifest_tool_version }}/manifest-tool-linux-amd64'
-        dest: '{{ manifest_tool_bin_dir }}/manifest-tool'
-        mode: '755'
diff --git a/utils/build-server-ansible/vars/CentOS.yml b/utils/build-server-ansible/vars/CentOS.yml
deleted file mode 100644 (file)
index 50839be..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-############################################################################
----
-- name: Ensure old versions of Docker are not installed.
-  package:
-    name: '{{ item }}'
-    state: absent
-  with_items:
-    - docker
-    - docker-common
-    - docker-engine
-
-- name: Add Docker GPG key.
-  rpm_key:
-    key: https://download.docker.com/linux/centos/gpg
-    state: present
-
-- name: Ensure epel is installed.
-  yum:
-    name: epel-release
-    state: present
-- name: Ensure depdencies are installed.
-  yum:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - bc
-    - collectd
-    - doxygen
-    - facter
-    - jq
-    - kernel-headers
-    - libpcap-devel
-    - libvirt-devel
-    - net-tools
-    - numactl-devel
-    - openssl-devel
-    - python-devel
-    - python-pip
-    - python-six
-    - python-sphinx
-    - rpm-build
-    - sysstat
-    - xmlstarlet
-    - zlib-devel
-
-- name: install the 'Development tools' package group
-  yum:
-    name: "@Development tools"
-    state: present
-
-- name: Add Docker repository.
-  get_url:
-    url: "{{ docker_yum_repo_url }}"
-    dest: '/etc/yum.repos.d/docker-ce.repo'
-    owner: root
-    group: root
-    mode: 0644
-
-- name: Configure Docker Edge repo.
-  ini_file:
-    dest: '/etc/yum.repos.d/docker-ce.repo'
-    section: 'docker-ce-edge'
-    option: enabled
-    value: '{{ docker_yum_repo_enable_edge }}'
-
-- name: Configure Docker Test repo.
-  ini_file:
-    dest: '/etc/yum.repos.d/docker-ce.repo'
-    section: 'docker-ce-test'
-    option: enabled
-    value: '{{ docker_yum_repo_enable_test }}'
diff --git a/utils/build-server-ansible/vars/Ubuntu.yml b/utils/build-server-ansible/vars/Ubuntu.yml
deleted file mode 100644 (file)
index 2e3e3fe..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#############################################################################
----
-- name: Ensure old versions of Docker are not installed.
-  package:
-    name: '{{ item }}'
-    state: absent
-  with_items:
-    - docker
-    - docker-engine
-
-- name: Ensure depdencies are installed.
-  apt:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - apt-transport-https
-    - ca-certificates
-    - git
-    - build-essential
-    - curl
-    - wget
-    - rpm
-    - fuseiso
-    - createrepo
-    - genisoimage
-    - libfuse-dev
-    - dh-autoreconf
-    - pkg-config
-    - zlib1g-dev
-    - libglib2.0-dev
-    - libpixman-1-dev
-    - python-virtualenv
-    - python-dev
-    - libffi-dev
-    - libssl-dev
-    - libxml2-dev
-    - libxslt1-dev
-    - bc
-    - qemu-kvm
-    - libvirt-bin
-    - ubuntu-vm-builder
-    - bridge-utils
-    - monit
-    - openjdk-8-jre-headless
-    - python-nose
-    - dirmngr
-    - collectd
-    - flex
-    - bison
-    - libnuma-dev
-    - shellcheck
-    - python-pip
-    - sysstat
-    - xmlstarlet
-    - facter
-    - jq
-    - python-tox
-    - collectd-dev
-    - python3
-    - python3-dev
-    - libdpdk-dev
-    - dpdk-dev
-    - fakeroot
-    - devscripts
-    - debhelper
-    - dpkg-dev
-    - po-debconf
-    - dh-systemd
-    - dh-strip-nondeterminism
-    - autotools-dev
-    - libltdl-dev
-    - iptables-dev
-    - javahelper
-    - libatasmart-dev
-    - libcap-dev
-    - libcurl4-gnutls-dev
-    - libdbi0-dev
-    - libesmtp-dev
-    - libganglia1-dev
-    - libgcrypt11-dev
-    - libgps-dev
-    - libhiredis-dev
-    - libi2c-dev
-    - libldap2-dev
-    - liblua5.3-dev
-    - liblvm2-dev
-    - libmemcached-dev
-    - libmodbus-dev
-    - libmnl-dev
-    - libmosquitto-dev
-    - libmysqlclient-dev
-    - libnotify-dev
-    - libopenipmi-dev
-    - liboping-dev
-    - libow-dev
-    - libpcap0.8-dev
-    - libpcap-dev
-    - libperl-dev
-    - libpq-dev
-    - libprotobuf-c-dev
-    - libriemann-client-dev
-    - librdkafka-dev
-    - librabbitmq-dev
-    - librrd-dev
-    - libsensors4-dev
-    - libsigrok-dev
-    - libsnmp-dev
-    - libsnmp9-dev
-    - snmp
-    - snmp-mibs-downloader
-    - snmpd
-    - perl
-    - libtokyocabinet-dev
-    - libtokyotyrant-dev
-    - libudev-dev
-    - libupsclient-dev
-    - libvarnishapi-dev
-    - libvirt-dev
-    - libvirt-daemon
-    - libxen-dev
-    - libyajl-dev
-    - linux-libc-dev
-    - default-jdk
-    - protobuf-c-compiler
-    - openvswitch-switch
-    - libjpeg-dev
-
-- name: Add Docker apt key.
-  apt_key:
-    url: https://download.docker.com/linux/ubuntu/gpg
-    id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
-    state: present
-  register: add_repository_key
-  ignore_errors: true
-
-- name: Ensure curl is present (on older systems without SNI).
-  package: name=curl state=present
-  when: add_repository_key|failed
-
-- name: Add Docker apt key (alternative for older systems without SNI).
-  # yamllint disable rule:line-length
-  shell: "curl -sSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -"
-  # yamllint enable rule:line-length
-  args:
-    warn: "no"
-  when: add_repository_key|failed
-
-- name: Add Docker repository.
-  apt_repository:
-    repo: "{{ docker_apt_repository }}"
-    state: present
-    update_cache: "yes"
diff --git a/utils/build-server-ansible/vars/defaults.yml b/utils/build-server-ansible/vars/defaults.yml
deleted file mode 100644 (file)
index ff37c95..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#############################################################################
----
-docker_package: "docker-ce"
-docker_package_state: present
-
-# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
-docker_apt_release_channel: stable
-# yamllint disable rule:line-length
-docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
-# yamllint enable rule:line-length
-
-# Used only for RedHat/CentOS.
-# yamllint disable rule:line-length
-docker_yum_repo_url: https://download.docker.com/linux/centos/docker-ce.repo
-# yamllint enable rule:line-length
-docker_yum_repo_enable_edge: 0
-docker_yum_repo_enable_test: 0
-
-manifest_tool_version: 'v0.7.0'
-manifest_tool_url: 'https://github.com/estesp/manifest-tool/releases/download'
-manifest_tool_bin_dir: '/usr/local/bin'
diff --git a/utils/build-server-ansible/vars/docker-compose-Ubuntu.yml b/utils/build-server-ansible/vars/docker-compose-Ubuntu.yml
deleted file mode 100644 (file)
index f985b6a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#############################################################################
-# Copyright (c) 2016 The Linux Foundation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#############################################################################
----
-- name: Ensure docker compose is installed
-  apt:
-    name: 'docker-compose'
-    state: present
index b217793..4a06b00 100755 (executable)
 # limitations under the License.
 ##############################################################################
 
-PATH=$PATH:/usr/local/bin/
-
-#These are the only projects that generate artifacts
-for x in armband ovsnfv fuel apex compass4nfv
+for x in airship apex armband compass4nfv fuel ovsnfv
 do
 
   echo "Looking at artifacts for project $x"
@@ -32,7 +29,7 @@ do
 
     if [[ "$daysold" -gt "10" ]]; then
       echo "$daysold Days old deleting: $(basename $artifact)"
-      gsutil rm "$artifact"
+      s4cmd del --endpoint-url https://storage.googleapis.com "$artifact"
     else
       echo "$daysold Days old retaining: $(basename $artifact)"
     fi