From: Eric Ball Date: Wed, 16 Oct 2019 23:09:48 +0000 (+0000) Subject: Merge "Migrate current Sonar jobs to Sonarcloud" X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=d82f046b536a4832d1a7733f2e6059f1446bae81;hp=92be5c3494146484285002f2f096fb561700cffc Merge "Migrate current Sonar jobs to Sonarcloud" --- diff --git a/.gitignore b/.gitignore index ce5c482..a475179 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,9 @@ cloud-env.json # Maven target/ -# Intellij IDEs +# IDE files +/.settings/ +.classpath +.project .idea + diff --git a/global-jjb b/global-jjb index a70124e..381cc03 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit a70124ef46b23063d25ec178e627ac226b8cef8f +Subproject commit 381cc03ffab74fb347bd1d8a17e7bc2703111650 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg index 6709397..dd16cf0 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v1-standard-1 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg index 31c020b..6ed2429 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v2-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg index 538ebcb..3fccd4a 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-16g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v1-standard-16 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg new file mode 100644 index 0000000..17acbe1 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg @@ -0,0 +1,2 @@ +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 +HARDWARE_ID=v2-highcpu-32 diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg index 0a79f04..fb8a055 100644 --- a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770 +IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20191003-203103.133 HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg new file mode 100644 index 0000000..1dc31f7 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-16g.cfg @@ -0,0 +1,2 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20190706-130528.514 +HARDWARE_ID=v2-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg new file mode 100644 index 0000000..36edfd3 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-16g.cfg @@ -0,0 +1,2 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20190804-002512.777 +HARDWARE_ID=v2-standard-4 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg new file mode 100644 index 0000000..1175316 --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-8c-8g.cfg @@ -0,0 +1,2 @@ +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20190804-002512.777 +HARDWARE_ID=v2-highcpu-8 diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index ba4dbbe..0405892 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -6,6 +6,7 @@ JENKINS_HOSTNAME=vex-yul-akraino-jenkins-prod-1 LOGS_SERVER=https://logs.akraino.org NEXUS_URL=https://nexus.akraino.org REGISTRY_PORTS=10001 10002 10003 10004 +RPM_REPO_URL=https://nexus3.akraino.org SIGUL_BRIDGE_IP=10.30.216.9 SIGUL_KEY=akraino-release-2018 SILO=production diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index f1ab6de..eda2b9f 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -5,6 +5,7 @@ JENKINS_HOSTNAME=vex-yul-akraino-jenkins-sandbox-1 LOGS_SERVER=https://logs.akraino.org NEXUS_URL=https://nexus.akraino.org REGISTRY_PORTS=10001 10002 10003 10004 +RPM_REPO_URL=https://nexus3.akraino.org SIGUL_BRIDGE_IP=10.30.216.9 SIGUL_KEY=akraino-sandbox SILO=sandbox diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml index 16f0db5..f031301 100644 --- a/jjb/akraino-templates/akraino-jjb-kni.yaml +++ b/jjb/akraino-templates/akraino-jjb-kni.yaml @@ -245,7 +245,7 @@ comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' scm: - - lf-infra-gerrit-scm: + - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/{project}.git' refspec: '$GERRIT_REFSPEC' @@ -254,7 +254,17 @@ submodule-timeout: '{submodule-timeout}' submodule-disable: false choosing-strategy: default - + basedir: 'blueprint-pae' + - akraino-lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}/kni/installer.git' + refspec: 'refs/heads/master' + branch: 'master' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: false + choosing-strategy: default + basedir: 'installer' triggers: - gerrit: server-name: '{gerrit-server-name}' @@ -275,8 +285,7 @@ target: akraino-secrets/coreos-pull-secret - shell: !include-raw-escape: - ../shell/install_go.sh - - shell: !include-raw-escape: - - ../shell/kni_deploy_aws.sh + - shell: ./installer/ci/kni_deploy_aws.sh publishers: - lf-infra-publish @@ -358,7 +367,7 @@ file-paths: '{obj:gerrit_trigger_file_paths}' scm: - - lf-infra-gerrit-scm: + - akraino-lf-infra-gerrit-scm: jenkins-ssh-credential: '{jenkins-ssh-credential}' git-url: '{git-url}/{project}.git' refspec: '$GERRIT_REFSPEC' @@ -367,7 +376,17 @@ submodule-timeout: '{submodule-timeout}' submodule-disable: false choosing-strategy: default - + basedir: 'blueprint-pae' + - akraino-lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}/kni/installer.git' + refspec: 'refs/heads/master' + branch: 'master' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + submodule-disable: false + choosing-strategy: default + basedir: 'installer' builders: - lf-infra-pre-build - config-file-provider: @@ -378,8 +397,7 @@ target: akraino-secrets/ssh-pub-key - shell: !include-raw-escape: - ../shell/install_go.sh - - shell: !include-raw-escape: - - ../shell/kni_deploy_libvirt.sh + - shell: ./installer/ci/kni_deploy_libvirt.sh publishers: - lf-infra-publish diff --git a/jjb/akraino-templates/akraino-jjb-macros.yaml b/jjb/akraino-templates/akraino-jjb-macros.yaml new file mode 100644 index 0000000..639e632 --- /dev/null +++ b/jjb/akraino-templates/akraino-jjb-macros.yaml @@ -0,0 +1,17 @@ +- scm: + # enhanced version of the global-jjb, based on ta-common-macros + name: akraino-lf-infra-gerrit-scm + scm: + - git: + credentials-id: '{jenkins-ssh-credential}' + url: '{git-url}' + refspec: '{refspec}' + branches: + - 'refs/heads/{branch}' + skip-tag: true + wipe-workspace: true + submodule: + recursive: '{submodule-recursive}' + timeout: '{submodule-timeout}' + choosing-strategy: '{choosing-strategy}' + basedir: '{basedir}' diff --git a/jjb/akraino-templates/akraino-ta-common-macros.yaml b/jjb/akraino-templates/akraino-ta-common-macros.yaml index 24436b9..bc46b57 100644 --- a/jjb/akraino-templates/akraino-ta-common-macros.yaml +++ b/jjb/akraino-templates/akraino-ta-common-macros.yaml @@ -37,7 +37,7 @@ - ta-parameters-rpmbuilder - parameter: - name: ta-parameters-ci-ta-rpmbuilder + name: ta-parameters-ci-ta/rpmbuilder parameters: - ta-parameters-manifest - ta-parameters-build-tools @@ -76,12 +76,20 @@ ########### # BUILDER # ########### +- builder: + name: lf-display-node-uuid + builders: + - shell: |2- + echo "---> Node UUID:" + curl -s http://169.254.169.254/openstack/latest/meta_data.json | python -c 'import sys, json; data = json.load(sys.stdin); print(data["uuid"])' || true + - builder: name: ta-builder-tox builders: - lf-pip-install: pip-packages: tox - shell: |2- + #!/bin/bash -ex source /tmp/v/tox/bin/activate for f in $(find $GERRIT_PROJECT -name tox.ini); do pushd $(dirname $f) @@ -93,18 +101,46 @@ name: ta-builder-rpm builders: - shell: |2- - sudo yum install -y createrepo - ta/build-tools/build_rpms.sh \ - -m ta/manifest \ - -r ta/rpmbuilder \ - -w work \ - {project-to-build} - find work/ + #!/bin/bash -ex + # Skip RPM build in case no *.spec file is found within the {project-to-build} + if [ -n "$(find {project-to-build} -name '*.spec')" ] + then + if apt --version 2>1 >/dev/null; then + sudo groupadd mock || true + sudo usermod -aG mock $USER + sudo apt update + # Explicitly install mock dependencies + sudo apt install -y createrepo alien systemd-container python-pip \ + python-decoratortools yum-utils usermode pigz + # We need a specific version of mock (1.4.14) and devtools + # not available in Ubuntu/Debian repos, so fetch them from RHEL mirrors + wget http://vault.centos.org/centos/7.6.1810/os/x86_64/Packages/rpmdevtools-8.3-5.el7.noarch.rpm \ + https://kojipkgs.fedoraproject.org/packages/mock/1.4.14/2.el7/noarch/mock-1.4.14-2.el7.noarch.rpm + sudo alien -d *.rpm + sudo dpkg -i *.deb + rm -rf *.rpm *.deb + # RHEL tools hardcode the full path for certain distro tools + sudo ln -sf /bin/tar /usr/bin/gtar + sudo ln -sf /bin/machinectl /bin/df /usr/bin/ + # Some mock dependencies are only available via pip + sudo pip install distro pyroute2 + else + sudo yum install -y createrepo + fi + ta/build-tools/build_rpms.sh \ + -m ta/manifest \ + -r ta/rpmbuilder \ + -w work \ + {project-to-build} + find work/ + fi - builder: name: ta-builder-scm builders: - shell: |2- + #!/bin/bash -ex + rm -rf {project} git clone {git-url}/{project} {project} pushd {project} if echo {ref} | grep -q "refs/"; then @@ -128,6 +164,10 @@ properties-content: 'ALT_NEXUS_URL=https://nexus3.akraino.org' - lf-infra-create-netrc: server-id: rpm.snapshots + - inject: + properties-content: | + ALT_NEXUS_URL= + SERVER_ID= - shell: !include-raw: # Ensure python-tools are installed in case job template does not # call the lf-infra-pre-build macro. @@ -175,7 +215,7 @@ project-to-build: '$GERRIT_PROJECT' - builder: - name: ta-builder-job-verify-ta-rpmbuilder + name: ta-builder-job-verify-ta/rpmbuilder builders: - ta-builder-scm: git-url: '{git-url}' @@ -217,8 +257,18 @@ name: ta-builder-install-docker builders: - shell: |2- - sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - sudo yum -y install docker-ce docker-ce-cli containerd.io + #!/bin/bash -ex + if apt --version 2>1 >/dev/null; then + sudo apt update + sudo apt install -y apt-transport-https ca-certificates curl software-properties-common + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository -y "deb http://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt update + sudo apt install -y docker-ce + else + sudo yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo + sudo yum -y install docker-ce docker-ce-cli containerd.io + fi sudo mkdir -p /etc/docker/ echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json sudo systemctl start docker @@ -230,7 +280,13 @@ name: ta-builder-install-build-tools builders: - shell: |2- - sudo yum -y install createrepo libguestfs-tools-c jq + #!/bin/bash -ex + if apt --version 2>1 >/dev/null; then + sudo apt update + sudo apt install -y createrepo libguestfs-tools jq + else + sudo yum -y install createrepo libguestfs-tools-c jq + fi sudo systemctl start libvirtd systemctl status libvirtd @@ -260,6 +316,11 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' readable-message: true + skip-vote: + successful: '{gerrit-skip-vote}' + failed: '{gerrit-skip-vote}' + unstable: '{gerrit-skip-vote}' + notbuilt: '{gerrit-skip-vote}' - trigger: name: ta-trigger-job-merge @@ -294,6 +355,6 @@ publishers: - lf-infra-publish - trigger-parameterized-builds: - - project: 'ta-ci-build' + - project: 'ta-ci-build-{arch}' condition: UNSTABLE_OR_BETTER trigger-with-no-params: true diff --git a/jjb/akraino-templates/akraino-ta-common-templates.yaml b/jjb/akraino-templates/akraino-ta-common-templates.yaml index e1ecc08..ca09e1a 100644 --- a/jjb/akraino-templates/akraino-ta-common-templates.yaml +++ b/jjb/akraino-templates/akraino-ta-common-templates.yaml @@ -18,6 +18,8 @@ project-type: freestyle submodule-recursive: true node: '{build-node}' + arch: amd64 + gerrit-skip-vote: false properties: - lf-infra-properties: @@ -57,6 +59,7 @@ triggers: - ta-trigger-job-{project-type}: gerrit-server-name: '{gerrit-server-name}' + gerrit-skip-vote: '{gerrit-skip-vote}' project: '{project}' branch: '{branch}' @@ -66,7 +69,8 @@ git-url: '{git-url}' publishers: - - ta-publisher-job-{project-type} + - ta-publisher-job-{project-type}: + arch: '{arch}' - job-template: id: akraino-project-stream-type-ta-rpmbuilder @@ -87,6 +91,7 @@ project-type: freestyle submodule-recursive: true node: '{build-node}' + gerrit-skip-vote: false properties: - lf-infra-properties: @@ -100,7 +105,7 @@ branch: '{branch}' lftools-version: '{lftools-version}' - - ta-parameters-ci-{project-name} + - ta-parameters-ci-{project} - string: name: ARCHIVE_ARTIFACTS @@ -126,11 +131,12 @@ triggers: - ta-trigger-job-{project-type}: gerrit-server-name: '{gerrit-server-name}' + gerrit-skip-vote: '{gerrit-skip-vote}' project: '{project}' branch: '{branch}' builders: - - ta-builder-job-{project-type}-{project-name}: + - ta-builder-job-{project-type}-{project}: git-url: '{git-url}' publishers: @@ -155,6 +161,7 @@ project-type: freestyle submodule-recursive: true node: '{build-node}' + gerrit-skip-vote: false properties: - lf-infra-properties: @@ -192,6 +199,7 @@ triggers: - ta-trigger-job-{project-type}: gerrit-server-name: '{gerrit-server-name}' + gerrit-skip-vote: '{gerrit-skip-vote}' project: '{project}' branch: '{branch}' @@ -204,7 +212,7 @@ - job-template: id: akraino-project-release-ta-build - name: 'ta-ci-build' + name: '{name}' archive-artifacts: > work/**/*.spec work/**/*.repo @@ -252,6 +260,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' builders: + - lf-display-node-uuid - ta-builder-scm: git-url: '{git-url}' project: 'ta/manifest' diff --git a/jjb/ci-management/ci-packer.yaml b/jjb/ci-management/ci-packer.yaml index 4cb815e..2f00039 100644 --- a/jjb/ci-management/ci-packer.yaml +++ b/jjb/ci-management/ci-packer.yaml @@ -34,6 +34,7 @@ project: ci-management project-name: ci-management build-node: centos7-builder-2c-1g + build-timeout: 90 templates: docker platforms: diff --git a/jjb/portal_user_interface/portal-onapsdk.yaml b/jjb/portal_user_interface/portal-onapsdk.yaml new file mode 100644 index 0000000..b3f6f1e --- /dev/null +++ b/jjb/portal_user_interface/portal-onapsdk.yaml @@ -0,0 +1,31 @@ +--- +# +# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +- project: + project: 'portal_user_interface/portal-onapsdk' + project-name: portal_user_interface-portal-onapsdk + name: portal_user_interface-portal-onapsdk-tox-verify + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + jobs: + - 'gerrit-tox-verify': + parallel: false + submodule-disable: true + build-node: centos7-builder-2c-1g + diff --git a/jjb/shell/kni_deploy_aws.sh b/jjb/shell/kni_deploy_aws.sh deleted file mode 100755 index d9c468d..0000000 --- a/jjb/shell/kni_deploy_aws.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2019 Red Hat -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e -u -x -o pipefail - -export PATH=$PATH:/usr/local/go/bin:/usr/local/bin -KNI_PATH='src/gerrit.akraino.org/kni/' -SITE_NAME='edge-sites-testing.devcluster.openshift.com' - -echo '---> Starting kni installer generation' -export GOPATH=${WORKSPACE}/ - -# move the blueprint to an inner directory -mkdir ${WORKSPACE}/blueprint-pae -mv base profiles sites tools ${WORKSPACE}/blueprint-pae/ - -# clone installer in the right directory -sudo rm -rf ${WORKSPACE}/${KNI_PATH} -mkdir -p ${WORKSPACE}/${KNI_PATH} -pushd ${WORKSPACE}/${KNI_PATH}/ -git clone https://gerrit.akraino.org/r/kni/installer -pushd installer - -# first build kni installer -make build 2>&1 | tee ${WORKSPACE}/build.log - -# add the right credentials to kni -mkdir $HOME/.kni || true -cp $WORKSPACE/akraino-secrets/coreos-pull-secret $HOME/.kni/pull-secret.json || true - -# start the workflow -./knictl fetch_requirements file://${WORKSPACE}/blueprint-pae//sites/${SITE_NAME} 2>&1 | tee ${WORKSPACE}/aws_requirements.log -./knictl prepare_manifests ${SITE_NAME} 2>&1 | tee ${WORKSPACE}/aws_manifests.log - -# now run the cluster -source $HOME/.kni/${SITE_NAME}/profile.env -$HOME/.kni/${SITE_NAME}/requirements/openshift-install create cluster --dir=/$HOME/.kni/${SITE_NAME}/final_manifests 2>&1 | tee ${WORKSPACE}/aws_deploy.log -STATUS=$? - -# output tfstate -echo "metadata.json for removing cluster" -cat $HOME/.kni/${SITE_NAME}/final_manifests/metadata.json - -if [ $STATUS -ne 0 ]; then - echo "Error deploying in AWS" - exit 1 -fi - -echo "Cluster successfully deployed! Start applying workloads" -./knictl apply_workloads ${SITE_NAME} 2>&1 | tee ${WORKSPACE}/aws_workloads.go -STATUS=$? - -if [ $STATUS -ne 0 ]; then - echo "Error applying workloads to AWS" - exit 1 -fi - -echo "Workloads successfully applied! Starting cleanup" -$HOME/.kni/${SITE_NAME}/requirements/openshift-install destroy cluster --dir=/$HOME/.kni/${SITE_NAME}/final_manifests 2>&1 | tee ${WORKSPACE}/aws_destroy.log -STATUS=$? - -popd - -exit $STATUS diff --git a/jjb/shell/kni_deploy_libvirt.sh b/jjb/shell/kni_deploy_libvirt.sh deleted file mode 100755 index f5d1932..0000000 --- a/jjb/shell/kni_deploy_libvirt.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2019 Red Hat -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e -u -x -o pipefail - -export PATH=$PATH:/usr/local/go/bin:/usr/local/bin -KNI_PATH='src/gerrit.akraino.org/kni/' -SITE_NAME='testing.virt.edge-sites.net' - -echo '---> Starting kni installer generation' -export GOPATH=${WORKSPACE}/ - -function approve_certs() { - # sleep for the first 10 min - sleep 600 - - # temporary fix, autoapprove certificates on background - while /bin/true; do - export KUBECONFIG=$HOME/.kni/${SITE_NAME}/final_manifests/auth/kubeconfig - oc get csr | grep worker | grep Pending | awk '{print $1}' | xargs -n 1 oc adm certificate approve || true - sleep 60 - done -} - -# move the blueprint to an inner directory -mkdir ${WORKSPACE}/blueprint-pae -mv base profiles sites tools ${WORKSPACE}/blueprint-pae/ - -# clone installer in the right directory -sudo rm -rf ${WORKSPACE}/${KNI_PATH} -mkdir -p ${WORKSPACE}/${KNI_PATH} -pushd ${WORKSPACE}/${KNI_PATH}/ -git clone https://gerrit.akraino.org/r/kni/installer -pushd installer - -# first build kni installer -make build 2>&1 | tee ${WORKSPACE}/build.log - -# do a host preparation and cleanup -bash utils/prep_host.sh virt.edge-sites.net -wget https://raw.githubusercontent.com/openshift/installer/master/scripts/maintenance/virsh-cleanup.sh -chmod a+x ./virsh-cleanup.sh -sudo -E bash -c "yes Y | ./virsh-cleanup.sh" - -# add the right credentials to kni -mkdir $HOME/.kni || true -cp $WORKSPACE/akraino-secrets/coreos-pull-secret $HOME/.kni/pull-secret.json || true -cp $HOME/.ssh/id_rsa.pub $HOME/.kni/id_rsa.pub || true - -# start the workflow -sudo rm -rf /$HOME/.kni/${SITE_NAME}/final_manifests || true -./knictl fetch_requirements file://${WORKSPACE}/blueprint-pae//sites/${SITE_NAME} 2>&1 | tee ${WORKSPACE}/libvirt_requirements.log -./knictl prepare_manifests ${SITE_NAME} 2>&1 | tee ${WORKSPACE}/libvirt_manifests.log - -# now run the cluster -source $HOME/.kni/${SITE_NAME}/profile.env -approve_certs & -FUNCTION_PID=$! -sudo -E $HOME/.kni/${SITE_NAME}/requirements/openshift-install create cluster --dir=/$HOME/.kni/${SITE_NAME}/final_manifests 2>&1 | tee ${WORKSPACE}/libvirt_deploy.log -STATUS=$? -kill $FUNCTION_PID || true - -# output tfstate -echo "metadata.json for removing cluster" -cat $HOME/.kni/${SITE_NAME}/final_manifests/metadata.json - -if [ $STATUS -ne 0 ]; then - echo "Error deploying in libvirt" - exit 1 -fi - -echo "Cluster successfully deployed! Start applying workloads" -./knictl apply_workloads ${SITE_NAME} 2>&1 | tee ${WORKSPACE}/libvirt_workloads.log -STATUS=$? - -if [ $STATUS -ne 0 ]; then - echo "Error applying workloads to libvirt" - exit 1 -fi - -popd -popd - -exit $STATUS diff --git a/jjb/shell/ta-iso-deploy.sh b/jjb/shell/ta-iso-deploy.sh index cbe86b9..c9d5559 100644 --- a/jjb/shell/ta-iso-deploy.sh +++ b/jjb/shell/ta-iso-deploy.sh @@ -27,6 +27,13 @@ nexus_repo_url="$NEXUS_URL/content/repositories/$NEXUS_REPO" mkdir -p "$upload_dir1" mkdir -p "$upload_dir2" +if [ "$(uname -m)" != 'x86_64' ]; then + # On non-x86 architecture, rename the artifacts appropiately + pushd "$WORKSPACE/work/results/images/" + rename "s/\./.$(uname -m)./" *.* + popd +fi + cp "$WORKSPACE/work/results/images/"* "$upload_dir1" cp "$WORKSPACE/work/results/images/"* "$upload_dir2" diff --git a/jjb/shell/ta-rpm-deploy.sh b/jjb/shell/ta-rpm-deploy.sh index 36c7c5b..f0381e8 100644 --- a/jjb/shell/ta-rpm-deploy.sh +++ b/jjb/shell/ta-rpm-deploy.sh @@ -20,15 +20,46 @@ NEXUS_REPO=rpm.snapshots release_path=TA/release-1 repo_dir="$WORKSPACE/work/nexus/$NEXUS_REPO" -x86_dir="$repo_dir/$release_path/rpms/x86_64" +arch_dir="$repo_dir/$release_path/rpms/$(uname -m)" sources_dir="$repo_dir/$release_path/rpms/Sources" -nexus_repo_url="$ALT_NEXUS_URL/repository/$NEXUS_REPO" +nexus_repo_url="$RPM_REPO_URL/repository/$NEXUS_REPO" +results_dir="$WORKSPACE/work/results" +repo_name=`echo $WORKSPACE | awk -F '/' '{print $4}' | cut -d '-' -f2- | sed 's|\(.*\)-.*|\1|'` -mkdir -p "$x86_dir" +#Creating dirs to move duplicate RPMs/SRPMs to avoid re-upload and copy the changed RPMs/SRPMs +rm -rf "$results_dir/repo/duplicates" "$results_dir/src_repo/duplicates" +mkdir "$results_dir/repo/duplicates" +mkdir "$results_dir/src_repo/duplicates" +mkdir -p "$arch_dir" mkdir -p "$sources_dir" -cp "$WORKSPACE/work/results/repo/"*.rpm "$x86_dir" -cp "$WORKSPACE/work/results/src_repo/"*.rpm "$sources_dir" +#List all RPMs available in Nexus, move the duplicates and copy the changed ones +for artifact in \ + `ls $results_dir/repo/*.rpm` + do + if curl -L --head --fail $nexus_repo_url/$release_path/rpms/$(uname -m)/$(basename $artifact) + then + echo "RPM - $(basename $artifact) already available in Nexus" + mv $results_dir/repo/$(basename $artifact) $results_dir/repo/duplicates/ + else + echo "RPM - $(basename $artifact) is not available in Nexus. Will be uploaded" + cp $results_dir/repo/$(basename $artifact) $arch_dir + fi + done + +#List all Source RPMs available in Nexus, move the duplicates and copy the changed ones +for artifact in \ + `ls $results_dir/src_repo/*.rpm` + do + if curl -L --head --fail $nexus_repo_url/$release_path/rpms/Sources/$(basename $artifact) + then + echo "Source RPM - $(basename $artifact) already available in Nexus" + mv $results_dir/src_repo/$(basename $artifact) $results_dir/src_repo/duplicates/ + else + echo "Source RPM - $(basename $artifact) is not available in Nexus. Will be uploaded" + cp $results_dir/src_repo/$(basename $artifact) $sources_dir + fi + done echo "-----> Upload RPMs to Nexus" lftools deploy nexus "$nexus_repo_url" "$repo_dir" diff --git a/jjb/starlingx/starlingx.yaml b/jjb/starlingx/starlingx.yaml index c1eb795..731aa84 100644 --- a/jjb/starlingx/starlingx.yaml +++ b/jjb/starlingx/starlingx.yaml @@ -11,10 +11,4 @@ - akraino-project-stream-verify views: - project-view - triggers: - - 'starlingx-weekly-master-trigger' - -- trigger: - name: 'starlingx-weekly-master-trigger' - triggers: - - timed: '0 11 * * 0' + cron: 'H H * * 0' # push fresh snapshot weekly diff --git a/jjb/ta/access-management.yaml b/jjb/ta/access-management.yaml index c963198..03067c0 100644 --- a/jjb/ta/access-management.yaml +++ b/jjb/ta/access-management.yaml @@ -1,7 +1,7 @@ - project: - name: ta-access-management + name: ta-access-management-amd64 project: ta/access-management - project-name: ta-access-management + project-name: ta-access-management-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-access-management-arm64 + project: ta/access-management + project-name: ta-access-management-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/ansible-role-ntp.yaml b/jjb/ta/ansible-role-ntp.yaml index d76c279..3acefa2 100644 --- a/jjb/ta/ansible-role-ntp.yaml +++ b/jjb/ta/ansible-role-ntp.yaml @@ -1,7 +1,7 @@ - project: - name: ta-ansible-role-ntp + name: ta-ansible-role-ntp-amd64 project: ta/ansible-role-ntp - project-name: ta-ansible-role-ntp + project-name: ta-ansible-role-ntp-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-ansible-role-ntp-arm64 + project: ta/ansible-role-ntp + project-name: ta-ansible-role-ntp-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/build-tools.yaml b/jjb/ta/build-tools.yaml index 05459b7..8ff97eb 100644 --- a/jjb/ta/build-tools.yaml +++ b/jjb/ta/build-tools.yaml @@ -1,10 +1,21 @@ - project: - name: ta-build-tools + name: ta-build-tools-amd64 project: ta/build-tools - project-name: ta-build-tools + project-name: ta-build-tools-amd64 project-type: - verify build-node: centos7-builder-2c-1g stream: master jobs: - akraino-project-stream-type-ta-build + +- project: + name: ta-build-tools-arm64 + project: ta/build-tools + project-name: ta-build-tools-arm64 + project-type: + - verify + build-node: aarch64_dev + stream: master + jobs: + - akraino-project-stream-type-ta-build diff --git a/jjb/ta/caas-cpupooler.yaml b/jjb/ta/caas-cpupooler.yaml index ba24cb9..76ee933 100644 --- a/jjb/ta/caas-cpupooler.yaml +++ b/jjb/ta/caas-cpupooler.yaml @@ -1,11 +1,25 @@ - project: - name: ta-caas-cpupooler + name: ta-caas-cpupooler-amd64 project: ta/caas-cpupooler - project-name: ta-caas-cpupooler + project-name: ta-caas-cpupooler-amd64 project-type: - merge - verify - build-node: centos7-builder-2c-1g + build-node: centos7-builder-2c-8g + stream: master + jobs: + - akraino-project-stream-type-ta + +- project: + name: ta-caas-cpupooler-arm64 + project: ta/caas-cpupooler + project-name: ta-caas-cpupooler-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-danm.yaml b/jjb/ta/caas-danm.yaml index 4011935..3d986bc 100644 --- a/jjb/ta/caas-danm.yaml +++ b/jjb/ta/caas-danm.yaml @@ -1,7 +1,7 @@ - project: - name: ta-caas-danm + name: ta-caas-danm-amd64 project: ta/caas-danm - project-name: ta-caas-danm + project-name: ta-caas-danm-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-caas-danm-arm64 + project: ta/caas-danm + project-name: ta-caas-danm-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-etcd.yaml b/jjb/ta/caas-etcd.yaml index 85a93f3..f1715d7 100644 --- a/jjb/ta/caas-etcd.yaml +++ b/jjb/ta/caas-etcd.yaml @@ -1,11 +1,25 @@ - project: - name: ta-caas-etcd + name: ta-caas-etcd-amd64 project: ta/caas-etcd - project-name: ta-caas-etcd + project-name: ta-caas-etcd-amd64 project-type: - merge - verify - build-node: centos7-builder-2c-1g + build-node: centos7-builder-2c-8g + stream: master + jobs: + - akraino-project-stream-type-ta + +- project: + name: ta-caas-etcd-arm64 + project: ta/caas-etcd + project-name: ta-caas-etcd-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-helm.yaml b/jjb/ta/caas-helm.yaml index 128f8d8..690decd 100644 --- a/jjb/ta/caas-helm.yaml +++ b/jjb/ta/caas-helm.yaml @@ -1,7 +1,7 @@ - project: - name: ta-caas-helm + name: ta-caas-helm-amd64 project: ta/caas-helm - project-name: ta-caas-helm + project-name: ta-caas-helm-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-caas-helm-arm64 + project: ta/caas-helm + project-name: ta-caas-helm-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-install.yaml b/jjb/ta/caas-install.yaml index 159b621..8a8a1d0 100644 --- a/jjb/ta/caas-install.yaml +++ b/jjb/ta/caas-install.yaml @@ -1,7 +1,7 @@ - project: - name: ta-caas-install + name: ta-caas-install-amd64 project: ta/caas-install - project-name: ta-caas-install + project-name: ta-caas-install-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-caas-install-arm64 + project: ta/caas-install + project-name: ta-caas-install-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-kubedns.yaml b/jjb/ta/caas-kubedns.yaml index d2b79ff..26678c6 100644 --- a/jjb/ta/caas-kubedns.yaml +++ b/jjb/ta/caas-kubedns.yaml @@ -1,11 +1,25 @@ - project: - name: ta-caas-kubedns + name: ta-caas-kubedns-amd64 project: ta/caas-kubedns - project-name: ta-caas-kubedns + project-name: ta-caas-kubedns-amd64 project-type: - merge - verify - build-node: centos7-builder-2c-1g + build-node: centos7-builder-2c-8g + stream: master + jobs: + - akraino-project-stream-type-ta + +- project: + name: ta-caas-kubedns-arm64 + project: ta/caas-kubedns + project-name: ta-caas-kubedns-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-kubernetes.yaml b/jjb/ta/caas-kubernetes.yaml index 19b114d..c03ad1f 100644 --- a/jjb/ta/caas-kubernetes.yaml +++ b/jjb/ta/caas-kubernetes.yaml @@ -1,7 +1,7 @@ - project: - name: ta-caas-kubernetes + name: ta-caas-kubernetes-amd64 project: ta/caas-kubernetes - project-name: ta-caas-kubernetes + project-name: ta-caas-kubernetes-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-caas-kubernetes-arm64 + project: ta/caas-kubernetes + project-name: ta-caas-kubernetes-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-lcm.yaml b/jjb/ta/caas-lcm.yaml index d95909d..18ae370 100644 --- a/jjb/ta/caas-lcm.yaml +++ b/jjb/ta/caas-lcm.yaml @@ -1,7 +1,7 @@ - project: - name: ta-caas-lcm + name: ta-caas-lcm-amd64 project: ta/caas-lcm - project-name: ta-caas-lcm + project-name: ta-caas-lcm-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-caas-lcm-arm64 + project: ta/caas-lcm + project-name: ta-caas-lcm-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-logging.yaml b/jjb/ta/caas-logging.yaml index befbd8a..3a19111 100644 --- a/jjb/ta/caas-logging.yaml +++ b/jjb/ta/caas-logging.yaml @@ -1,7 +1,7 @@ - project: - name: ta-caas-logging + name: ta-caas-logging-amd64 project: ta/caas-logging - project-name: ta-caas-logging + project-name: ta-caas-logging-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-caas-logging-arm64 + project: ta/caas-logging + project-name: ta-caas-logging-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-metrics.yaml b/jjb/ta/caas-metrics.yaml index 7921ea2..5cb90bc 100644 --- a/jjb/ta/caas-metrics.yaml +++ b/jjb/ta/caas-metrics.yaml @@ -1,11 +1,25 @@ - project: - name: ta-caas-metrics + name: ta-caas-metrics-amd64 project: ta/caas-metrics - project-name: ta-caas-metrics + project-name: ta-caas-metrics-amd64 project-type: - merge - verify - build-node: centos7-builder-2c-8g + build-node: centos7-builder-8c-16g + stream: master + jobs: + - akraino-project-stream-type-ta + +- project: + name: ta-caas-metrics-arm64 + project: ta/caas-metrics + project-name: ta-caas-metrics-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-registry.yaml b/jjb/ta/caas-registry.yaml index f4ec60c..776b3a9 100644 --- a/jjb/ta/caas-registry.yaml +++ b/jjb/ta/caas-registry.yaml @@ -1,11 +1,25 @@ - project: - name: ta-caas-registry + name: ta-caas-registry-amd64 project: ta/caas-registry - project-name: ta-caas-registry + project-name: ta-caas-registry-amd64 project-type: - merge - verify - build-node: centos7-builder-2c-1g + build-node: centos7-builder-2c-8g + stream: master + jobs: + - akraino-project-stream-type-ta + +- project: + name: ta-caas-registry-arm64 + project: ta/caas-registry + project-name: ta-caas-registry-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 stream: master jobs: - akraino-project-stream-type-ta diff --git a/jjb/ta/caas-security.yaml b/jjb/ta/caas-security.yaml index 59025ae..4adc117 100644 --- a/jjb/ta/caas-security.yaml +++ b/jjb/ta/caas-security.yaml @@ -1,7 +1,7 @@ - project: - name: ta-caas-security + name: ta-caas-security-amd64 project: ta/caas-security - project-name: ta-caas-security + project-name: ta-caas-security-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-caas-security-arm64 + project: ta/caas-security + project-name: ta-caas-security-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/ci-build.yaml b/jjb/ta/ci-build.yaml index 97b9609..dab1436 100644 --- a/jjb/ta/ci-build.yaml +++ b/jjb/ta/ci-build.yaml @@ -1,8 +1,19 @@ - project: - name: ta-ci-build + name: ta-ci-build-amd64 project: none project-name: none - build-node: centos7-builder-8c-16g + build-node: centos7-builder-8c-32g stream: master + build-timeout: 120 + jobs: + - akraino-project-release-ta-build + +- project: + name: ta-ci-build-arm64 + project: none + project-name: none + build-node: aarch64_dev + stream: master + build-timeout: 120 jobs: - akraino-project-release-ta-build diff --git a/jjb/ta/cloudtaf.yaml b/jjb/ta/cloudtaf.yaml new file mode 100644 index 0000000..aa6ee4c --- /dev/null +++ b/jjb/ta/cloudtaf.yaml @@ -0,0 +1,23 @@ +- project: + name: ta-cloudtaf-amd64 + project: ta/cloudtaf + project-name: ta-cloudtaf-amd64 + project-type: + - verify + build-node: centos7-builder-2c-1g + stream: master + jobs: + - akraino-project-stream-type-ta + +- project: + name: ta-cloudtaf-arm64 + project: ta/cloudtaf + project-name: ta-cloudtaf-arm64 + project-type: + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/cm-plugins.yaml b/jjb/ta/cm-plugins.yaml index 1f2d479..d178adb 100644 --- a/jjb/ta/cm-plugins.yaml +++ b/jjb/ta/cm-plugins.yaml @@ -1,7 +1,7 @@ - project: - name: ta-cm-plugins + name: ta-cm-plugins-amd64 project: ta/cm-plugins - project-name: ta-cm-plugins + project-name: ta-cm-plugins-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-cm-plugins-arm64 + project: ta/cm-plugins + project-name: ta-cm-plugins-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/config-manager.yaml b/jjb/ta/config-manager.yaml index 50876de..728318e 100644 --- a/jjb/ta/config-manager.yaml +++ b/jjb/ta/config-manager.yaml @@ -1,7 +1,7 @@ - project: - name: ta-config-manager + name: ta-config-manager-amd64 project: ta/config-manager - project-name: ta-config-manager + project-name: ta-config-manager-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-config-manager-arm64 + project: ta/config-manager + project-name: ta-config-manager-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/distributed-state-server.yaml b/jjb/ta/distributed-state-server.yaml index 862081d..d810cd4 100644 --- a/jjb/ta/distributed-state-server.yaml +++ b/jjb/ta/distributed-state-server.yaml @@ -1,7 +1,7 @@ - project: - name: ta-distributed-state-server + name: ta-distributed-state-server-amd64 project: ta/distributed-state-server - project-name: ta-distributed-state-server + project-name: ta-distributed-state-server-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-distributed-state-server-arm64 + project: ta/distributed-state-server + project-name: ta-distributed-state-server-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/hostcli.yaml b/jjb/ta/hostcli.yaml index 8528ed8..c44c6a8 100644 --- a/jjb/ta/hostcli.yaml +++ b/jjb/ta/hostcli.yaml @@ -1,7 +1,7 @@ - project: - name: ta-hostcli + name: ta-hostcli-amd64 project: ta/hostcli - project-name: ta-hostcli + project-name: ta-hostcli-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-hostcli-arm64 + project: ta/hostcli + project-name: ta-hostcli-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/hw-detector.yaml b/jjb/ta/hw-detector.yaml index 7d56254..d494aa1 100644 --- a/jjb/ta/hw-detector.yaml +++ b/jjb/ta/hw-detector.yaml @@ -1,7 +1,7 @@ - project: - name: ta-hw-detector + name: ta-hw-detector-amd64 project: ta/hw-detector - project-name: ta-hw-detector + project-name: ta-hw-detector-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-hw-detector-arm64 + project: ta/hw-detector + project-name: ta-hw-detector-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/image-provision.yaml b/jjb/ta/image-provision.yaml index 7618dba..d9cd0fd 100644 --- a/jjb/ta/image-provision.yaml +++ b/jjb/ta/image-provision.yaml @@ -1,7 +1,7 @@ - project: - name: ta-image-provision + name: ta-image-provision-amd64 project: ta/image-provision - project-name: ta-image-provision + project-name: ta-image-provision-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-image-provision-arm64 + project: ta/image-provision + project-name: ta-image-provision-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/infra-ansible.yaml b/jjb/ta/infra-ansible.yaml index ee1e47e..a661434 100644 --- a/jjb/ta/infra-ansible.yaml +++ b/jjb/ta/infra-ansible.yaml @@ -1,7 +1,7 @@ - project: - name: ta-infra-ansible + name: ta-infra-ansible-amd64 project: ta/infra-ansible - project-name: ta-infra-ansible + project-name: ta-infra-ansible-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-infra-ansible-arm64 + project: ta/infra-ansible + project-name: ta-infra-ansible-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/ipa-deployer.yaml b/jjb/ta/ipa-deployer.yaml index 42370d9..59d3f8d 100644 --- a/jjb/ta/ipa-deployer.yaml +++ b/jjb/ta/ipa-deployer.yaml @@ -1,7 +1,7 @@ - project: - name: ta-ipa-deployer + name: ta-ipa-deployer-amd64 project: ta/ipa-deployer - project-name: ta-ipa-deployer + project-name: ta-ipa-deployer-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-ipa-deployer-arm64 + project: ta/ipa-deployer + project-name: ta-ipa-deployer-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/ironic-virtmedia-driver.yaml b/jjb/ta/ironic-virtmedia-driver.yaml index 493b497..ea528dc 100644 --- a/jjb/ta/ironic-virtmedia-driver.yaml +++ b/jjb/ta/ironic-virtmedia-driver.yaml @@ -1,7 +1,7 @@ - project: - name: ta-ironic-virtmedia-driver + name: ta-ironic-virtmedia-driver-amd64 project: ta/ironic-virtmedia-driver - project-name: ta-ironic-virtmedia-driver + project-name: ta-ironic-virtmedia-driver-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-ironic-virtmedia-driver-arm64 + project: ta/ironic-virtmedia-driver + project-name: ta-ironic-virtmedia-driver-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/ironic.yaml b/jjb/ta/ironic.yaml index 8368c0e..a9c505a 100644 --- a/jjb/ta/ironic.yaml +++ b/jjb/ta/ironic.yaml @@ -1,7 +1,7 @@ - project: - name: ta-ironic + name: ta-ironic-amd64 project: ta/ironic - project-name: ta-ironic + project-name: ta-ironic-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-ironic-arm64 + project: ta/ironic + project-name: ta-ironic-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/ironicclient.yaml b/jjb/ta/ironicclient.yaml index 48ae97d..a6b943e 100644 --- a/jjb/ta/ironicclient.yaml +++ b/jjb/ta/ironicclient.yaml @@ -1,7 +1,7 @@ - project: - name: ta-ironicclient + name: ta-ironicclient-amd64 project: ta/ironicclient - project-name: ta-ironicclient + project-name: ta-ironicclient-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-ironicclient-arm64 + project: ta/ironicclient + project-name: ta-ironicclient-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/lockcli.yaml b/jjb/ta/lockcli.yaml index b2a77e5..9129c8c 100644 --- a/jjb/ta/lockcli.yaml +++ b/jjb/ta/lockcli.yaml @@ -1,7 +1,7 @@ - project: - name: ta-lockcli + name: ta-lockcli-amd64 project: ta/lockcli - project-name: ta-lockcli + project-name: ta-lockcli-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-lockcli-arm64 + project: ta/lockcli + project-name: ta-lockcli-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/manifest.yaml b/jjb/ta/manifest.yaml index 7089ef8..2c4570f 100644 --- a/jjb/ta/manifest.yaml +++ b/jjb/ta/manifest.yaml @@ -1,10 +1,21 @@ - project: - name: ta-manifest + name: ta-manifest-amd64 project: ta/manifest - project-name: ta-manifest + project-name: ta-manifest-amd64 project-type: - verify build-node: centos7-builder-2c-1g stream: master jobs: - akraino-project-stream-type-ta-build + +- project: + name: ta-manifest-arm64 + project: ta/manifest + project-name: ta-manifest-arm64 + project-type: + - verify + build-node: aarch64_dev + stream: master + jobs: + - akraino-project-stream-type-ta-build diff --git a/jjb/ta/monitoring.yaml b/jjb/ta/monitoring.yaml index 3ac1e9d..45d074c 100644 --- a/jjb/ta/monitoring.yaml +++ b/jjb/ta/monitoring.yaml @@ -1,7 +1,7 @@ - project: - name: ta-monitoring + name: ta-monitoring-amd64 project: ta/monitoring - project-name: ta-monitoring + project-name: ta-monitoring-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-monitoring-arm64 + project: ta/monitoring + project-name: ta-monitoring-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-galera_client.yaml b/jjb/ta/openstack-ansible-galera_client.yaml index 65c54a7..e1c92e6 100644 --- a/jjb/ta/openstack-ansible-galera_client.yaml +++ b/jjb/ta/openstack-ansible-galera_client.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-galera_client + name: ta-openstack-ansible-galera_client-amd64 project: ta/openstack-ansible-galera_client - project-name: ta-openstack-ansible-galera_client + project-name: ta-openstack-ansible-galera_client-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-galera_client-arm64 + project: ta/openstack-ansible-galera_client + project-name: ta-openstack-ansible-galera_client-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-galera_server.yaml b/jjb/ta/openstack-ansible-galera_server.yaml index 5f70768..f5cf0bb 100644 --- a/jjb/ta/openstack-ansible-galera_server.yaml +++ b/jjb/ta/openstack-ansible-galera_server.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-galera_server + name: ta-openstack-ansible-galera_server-amd64 project: ta/openstack-ansible-galera_server - project-name: ta-openstack-ansible-galera_server + project-name: ta-openstack-ansible-galera_server-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-galera_server-arm64 + project: ta/openstack-ansible-galera_server + project-name: ta-openstack-ansible-galera_server-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-haproxy_server.yaml b/jjb/ta/openstack-ansible-haproxy_server.yaml index e5b66e3..430ffd5 100644 --- a/jjb/ta/openstack-ansible-haproxy_server.yaml +++ b/jjb/ta/openstack-ansible-haproxy_server.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-haproxy_server + name: ta-openstack-ansible-haproxy_server-amd64 project: ta/openstack-ansible-haproxy_server - project-name: ta-openstack-ansible-haproxy_server + project-name: ta-openstack-ansible-haproxy_server-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-haproxy_server-arm64 + project: ta/openstack-ansible-haproxy_server + project-name: ta-openstack-ansible-haproxy_server-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-memcached_server.yaml b/jjb/ta/openstack-ansible-memcached_server.yaml index 9144222..68ac9d0 100644 --- a/jjb/ta/openstack-ansible-memcached_server.yaml +++ b/jjb/ta/openstack-ansible-memcached_server.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-memcached_server + name: ta-openstack-ansible-memcached_server-amd64 project: ta/openstack-ansible-memcached_server - project-name: ta-openstack-ansible-memcached_server + project-name: ta-openstack-ansible-memcached_server-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-memcached_server-arm64 + project: ta/openstack-ansible-memcached_server + project-name: ta-openstack-ansible-memcached_server-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-openstack_openrc.yaml b/jjb/ta/openstack-ansible-openstack_openrc.yaml index 51f3e6f..34b666d 100644 --- a/jjb/ta/openstack-ansible-openstack_openrc.yaml +++ b/jjb/ta/openstack-ansible-openstack_openrc.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-openstack_openrc + name: ta-openstack-ansible-openstack_openrc-amd64 project: ta/openstack-ansible-openstack_openrc - project-name: ta-openstack-ansible-openstack_openrc + project-name: ta-openstack-ansible-openstack_openrc-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-openstack_openrc-arm64 + project: ta/openstack-ansible-openstack_openrc + project-name: ta-openstack-ansible-openstack_openrc-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-os_ironic.yaml b/jjb/ta/openstack-ansible-os_ironic.yaml index 5bf65ec..eff19fe 100644 --- a/jjb/ta/openstack-ansible-os_ironic.yaml +++ b/jjb/ta/openstack-ansible-os_ironic.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-os_ironic + name: ta-openstack-ansible-os_ironic-amd64 project: ta/openstack-ansible-os_ironic - project-name: ta-openstack-ansible-os_ironic + project-name: ta-openstack-ansible-os_ironic-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-os_ironic-arm64 + project: ta/openstack-ansible-os_ironic + project-name: ta-openstack-ansible-os_ironic-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-os_keystone.yaml b/jjb/ta/openstack-ansible-os_keystone.yaml index 7919daf..68d8c0f 100644 --- a/jjb/ta/openstack-ansible-os_keystone.yaml +++ b/jjb/ta/openstack-ansible-os_keystone.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-os_keystone + name: ta-openstack-ansible-os_keystone-amd64 project: ta/openstack-ansible-os_keystone - project-name: ta-openstack-ansible-os_keystone + project-name: ta-openstack-ansible-os_keystone-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-os_keystone-arm64 + project: ta/openstack-ansible-os_keystone + project-name: ta-openstack-ansible-os_keystone-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-plugins.yaml b/jjb/ta/openstack-ansible-plugins.yaml index 46c1d0d..0310591 100644 --- a/jjb/ta/openstack-ansible-plugins.yaml +++ b/jjb/ta/openstack-ansible-plugins.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-plugins + name: ta-openstack-ansible-plugins-amd64 project: ta/openstack-ansible-plugins - project-name: ta-openstack-ansible-plugins + project-name: ta-openstack-ansible-plugins-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-plugins-arm64 + project: ta/openstack-ansible-plugins + project-name: ta-openstack-ansible-plugins-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-rabbitmq_server.yaml b/jjb/ta/openstack-ansible-rabbitmq_server.yaml index bfbe7e4..5f9c833 100644 --- a/jjb/ta/openstack-ansible-rabbitmq_server.yaml +++ b/jjb/ta/openstack-ansible-rabbitmq_server.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-rabbitmq_server + name: ta-openstack-ansible-rabbitmq_server-amd64 project: ta/openstack-ansible-rabbitmq_server - project-name: ta-openstack-ansible-rabbitmq_server + project-name: ta-openstack-ansible-rabbitmq_server-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-rabbitmq_server-arm64 + project: ta/openstack-ansible-rabbitmq_server + project-name: ta-openstack-ansible-rabbitmq_server-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible-rsyslog_client.yaml b/jjb/ta/openstack-ansible-rsyslog_client.yaml index 3ae7ed9..396f509 100644 --- a/jjb/ta/openstack-ansible-rsyslog_client.yaml +++ b/jjb/ta/openstack-ansible-rsyslog_client.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible-rsyslog_client + name: ta-openstack-ansible-rsyslog_client-amd64 project: ta/openstack-ansible-rsyslog_client - project-name: ta-openstack-ansible-rsyslog_client + project-name: ta-openstack-ansible-rsyslog_client-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-rsyslog_client-arm64 + project: ta/openstack-ansible-rsyslog_client + project-name: ta-openstack-ansible-rsyslog_client-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/openstack-ansible.yaml b/jjb/ta/openstack-ansible.yaml index ca609a4..965ffd3 100644 --- a/jjb/ta/openstack-ansible.yaml +++ b/jjb/ta/openstack-ansible.yaml @@ -1,7 +1,7 @@ - project: - name: ta-openstack-ansible + name: ta-openstack-ansible-amd64 project: ta/openstack-ansible - project-name: ta-openstack-ansible + project-name: ta-openstack-ansible-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-openstack-ansible-arm64 + project: ta/openstack-ansible + project-name: ta-openstack-ansible-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/os-net-config.yaml b/jjb/ta/os-net-config.yaml index 762fe8f..d0bfa49 100644 --- a/jjb/ta/os-net-config.yaml +++ b/jjb/ta/os-net-config.yaml @@ -1,7 +1,7 @@ - project: - name: ta-os-net-config + name: ta-os-net-config-amd64 project: ta/os-net-config - project-name: ta-os-net-config + project-name: ta-os-net-config-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-os-net-config-arm64 + project: ta/os-net-config + project-name: ta-os-net-config-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/python-ilorest-library.yaml b/jjb/ta/python-ilorest-library.yaml index b1daaa1..938885a 100644 --- a/jjb/ta/python-ilorest-library.yaml +++ b/jjb/ta/python-ilorest-library.yaml @@ -1,7 +1,7 @@ - project: - name: ta-python-ilorest-library + name: ta-python-ilorest-library-amd64 project: ta/python-ilorest-library - project-name: ta-python-ilorest-library + project-name: ta-python-ilorest-library-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-python-ilorest-library-arm64 + project: ta/python-ilorest-library + project-name: ta-python-ilorest-library-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/python-peewee.yaml b/jjb/ta/python-peewee.yaml index 576f6aa..c378c6b 100644 --- a/jjb/ta/python-peewee.yaml +++ b/jjb/ta/python-peewee.yaml @@ -1,7 +1,7 @@ - project: - name: ta-python-peewee + name: ta-python-peewee-amd64 project: ta/python-peewee - project-name: ta-python-peewee + project-name: ta-python-peewee-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-python-peewee-arm64 + project: ta/python-peewee + project-name: ta-python-peewee-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/rpmbuilder.yaml b/jjb/ta/rpmbuilder.yaml index 3bbacb1..4bfe5c9 100644 --- a/jjb/ta/rpmbuilder.yaml +++ b/jjb/ta/rpmbuilder.yaml @@ -1,10 +1,21 @@ - project: - name: ta-rpmbuilder + name: ta-rpmbuilder-amd64 project: ta/rpmbuilder - project-name: ta-rpmbuilder + project-name: ta-rpmbuilder-amd64 project-type: - verify build-node: centos7-builder-2c-1g stream: master jobs: - akraino-project-stream-type-ta-rpmbuilder + +- project: + name: ta-rpmbuilder-arm64 + project: ta/rpmbuilder + project-name: ta-rpmbuilder-arm64 + project-type: + - verify + build-node: aarch64_dev + stream: master + jobs: + - akraino-project-stream-type-ta-rpmbuilder diff --git a/jjb/ta/start-menu.yaml b/jjb/ta/start-menu.yaml index 4a2cfbb..7c2851f 100644 --- a/jjb/ta/start-menu.yaml +++ b/jjb/ta/start-menu.yaml @@ -1,7 +1,7 @@ - project: - name: ta-start-menu + name: ta-start-menu-amd64 project: ta/start-menu - project-name: ta-start-menu + project-name: ta-start-menu-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-start-menu-arm64 + project: ta/start-menu + project-name: ta-start-menu-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/storage.yaml b/jjb/ta/storage.yaml index 4efd1dc..edd7495 100644 --- a/jjb/ta/storage.yaml +++ b/jjb/ta/storage.yaml @@ -1,7 +1,7 @@ - project: - name: ta-storage + name: ta-storage-amd64 project: ta/storage - project-name: ta-storage + project-name: ta-storage-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-storage-arm64 + project: ta/storage + project-name: ta-storage-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/jjb/ta/yarf.yaml b/jjb/ta/yarf.yaml index a9f93e6..aa2c1c1 100644 --- a/jjb/ta/yarf.yaml +++ b/jjb/ta/yarf.yaml @@ -1,7 +1,7 @@ - project: - name: ta-yarf + name: ta-yarf-amd64 project: ta/yarf - project-name: ta-yarf + project-name: ta-yarf-amd64 project-type: - merge - verify @@ -9,3 +9,17 @@ stream: master jobs: - akraino-project-stream-type-ta + +- project: + name: ta-yarf-arm64 + project: ta/yarf + project-name: ta-yarf-arm64 + project-type: + - merge + - verify + build-node: aarch64_dev + gerrit-skip-vote: true + arch: arm64 + stream: master + jobs: + - akraino-project-stream-type-ta diff --git a/packer/common-packer b/packer/common-packer index 837c821..57648e1 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 837c821df6fa77bd81a73ecbee94bdd8e24b3172 +Subproject commit 57648e1600c3c2457900ad4872f26d8f5cd679c7 diff --git a/packer/vars/ubuntu-18.04-arm64.json b/packer/vars/ubuntu-18.04-arm64.json new file mode 100644 index 0000000..791bfb3 --- /dev/null +++ b/packer/vars/ubuntu-18.04-arm64.json @@ -0,0 +1,11 @@ +{ + "arch": "arm64", + "base_image": "Ubuntu 18.04 LTS (arm64) [2018-04-29]", + "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh", + "distro": "Ubuntu 18.04", + "flavor": "v2-standard-1", + "source_ami_filter_name": "*ubuntu*16.04*", + "source_ami_filter_owner": "099720109477", + "ssh_user": "ubuntu", + "vm_use_block_storage": "true" +}